summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2014-05-16drivers/w1/w1_int.c: call put_device if device_register failsLevente Kurusa
Currently, memsetting and kfreeing the device is bad behaviour. The device will have a reference count of 1 and hence can cause trouble because it has kfree'd. Proper way to handle a failed device_register is to call put_device right after it fails. Signed-off-by: Levente Kurusa <levex@linux.com> Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2014-05-16rtc: s5m: consolidate two device type switch statementsKrzysztof Kozlowski
In probe the configuration of driver for different chipsets was done in two switch (pdata->device_type) statements. Consolidate them into one switch statement to increase code readability. Additionally check the return value of regmap_irq_get_virq and exit probe on error. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Lee Jones <lee.jones@linaro.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Sangbeom Kim <sbkim73@samsung.com> Cc: Samuel Ortiz <sameo@linux.intel.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2014-05-16rtc: s5m: add support for S2MPS14 RTCKrzysztof Kozlowski
Add support for S2MPS14 to the rtc-s5m driver. Differences in S2MPS14 (in comparison to S5M8767): - Layout of registers; - Lack of century support for time and alarms (7 registers used for storing time/alarm); - Two buffer control registers: WUDR and RUDR; - No register for enabling writing time; - RTC interrupts are reported in main PMIC I2C device; Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Lee Jones <lee.jones@linaro.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Sangbeom Kim <sbkim73@samsung.com> Cc: Samuel Ortiz <sameo@linux.intel.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2014-05-16rtc: s5m: support different register layoutKrzysztof Kozlowski
Prepare for adding support for S2MPS14 RTC device to the rtc-s5m driver: 1. Add a map of registers used by the driver which differ between the chipsets (S5M876X and S2MPS14). 2. Move code of checking for alarm pending to separate function. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Lee Jones <lee.jones@linaro.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Sangbeom Kim <sbkim73@samsung.com> Cc: Samuel Ortiz <sameo@linux.intel.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2014-05-16rtc: s5m: use shorter time of register updateKrzysztof Kozlowski
Set the time needed for updating alarm and time registers to 0.45 ms. The default is 7.32 ms which is too long and leads to warnings when setting alarm or time: s5m-rtc: waiting for UDR update, reached max number of retries Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Lee Jones <lee.jones@linaro.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Sangbeom Kim <sbkim73@samsung.com> Cc: Samuel Ortiz <sameo@linux.intel.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2014-05-16rtc: s5m: remove undocumented time init on first bootKrzysztof Kozlowski
Remove the code for initializing time if this is first boot. The code for detecting first boot uses undocumented field RTC_TCON in RTC_UDR_CON register. According to S5M8767's datasheet this field is reserved. On S2MPS14 it is not documented at all. On device first boot the registers will be initialized with reset value (2000-01-01 00:00:00). The code might work on S5M8763 but still this does not look like a task for RTC driver. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Lee Jones <lee.jones@linaro.org> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Sangbeom Kim <sbkim73@samsung.com> Cc: Samuel Ortiz <sameo@linux.intel.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2014-05-16mfd/rtc: sec/s5m: rename SEC* symbols to S5MKrzysztof Kozlowski
Prepare for adding support for S2MPS14 RTC device to the rtc-s5m driver: 1. Rename SEC* symbols to S5M. 2. Add S5M prefix to some of defines which are different between S5M876X and S2MPS14. This is only a rename-like patch, new code is not added. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Acked-by: Lee Jones <lee.jones@linaro.org> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Sangbeom Kim <sbkim73@samsung.com> Cc: Samuel Ortiz <sameo@linux.intel.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2014-05-16scsi: convert use of typedef ctl_table to struct ctl_tableJoe Perches
This typedef is unnecessary and should just be removed. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2014-05-16parport: convert use of typedef ctl_table to struct ctl_tableJoe Perches
This typedef is unnecessary and should just be removed. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2014-05-16random: convert use of typedef ctl_table to struct ctl_tableJoe Perches
This typedef is unnecessary and should just be removed. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2014-05-16cdrom: convert use of typedef ctl_table to struct ctl_tableJoe Perches
This typedef is unnecessary and should just be removed. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2014-05-16drivers/gpio/gpio-zevio.c: fix buildAndrew Morton
Unbreak i386 allmodconfig. This is a hack - please fix properly ;) Cc: Fabian Vogt <fabian@ritter-vogt.de> Cc: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2014-05-16Merge branch 'akpm-current/current'Stephen Rothwell
Conflicts: arch/x86/kernel/apic/hw_nmi.c mm/memblock.c mm/memcontrol.c
2014-05-16Merge remote-tracking branch 'clk/clk-next'Stephen Rothwell
Conflicts: Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
2014-05-16Merge remote-tracking branch 'pwm/for-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'dma-mapping/dma-mapping-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'gpio/for-next'Stephen Rothwell
Conflicts: Documentation/driver-model/devres.txt
2014-05-16Merge remote-tracking branch 'pinctrl/for-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'char-misc/char-misc-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'staging/staging-next'Stephen Rothwell
Conflicts: drivers/iio/adc/Kconfig
2014-05-16Merge remote-tracking branch 'usb-gadget/next'Stephen Rothwell
Conflicts: drivers/usb/phy/phy-mv-u3d-usb.c
2014-05-16Merge remote-tracking branch 'usb/usb-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'tty/tty-next'Stephen Rothwell
Conflicts: arch/arm64/kernel/early_printk.c
2014-05-16Merge remote-tracking branch 'driver-core/driver-core-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'leds/for-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'hsi/for-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'regmap/for-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'xen-tip/linux-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'kvm/linux-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'edac-amd/for-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'tip/auto-latest'Stephen Rothwell
Conflicts: drivers/block/mtip32xx/mtip32xx.c kernel/sched/idle.c net/ipv4/tcp_output.c
2014-05-16Merge remote-tracking branch 'spi/for-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'dt-rh/for-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'trivial/for-next'Stephen Rothwell
Conflicts: Documentation/devicetree/bindings/arm/omap/omap.txt
2014-05-16Merge remote-tracking branch 'iommu/next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'watchdog/master'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'regulator/for-next'Stephen Rothwell
Conflicts: drivers/regulator/tps65090-regulator.c
2014-05-16Merge remote-tracking branch 'omap_dss2/for-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'mfd-lj/for-mfd-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'md/for-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'mmc-uh/next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'mmc/mmc-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'device-mapper/for-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'block/for-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'input/next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'virtio/virtio-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'modules/modules-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'sound-asoc/for-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next'Stephen Rothwell
2014-05-16Merge remote-tracking branch 'drm-intel/for-linux-next'Stephen Rothwell