mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6
* 'spi/next' of git://git.secretlab.ca/git/linux-2.6: (34 commits)
spi/dw_spi: move dw_spi.h into drivers/spi
spi/dw_spi: Fix missing header
gpio/langwell: Clear edge bit before handling
gpio/langwell: Simplify demux loop
gpio/langwell: Convert irq name space
gpio/langwell: Fix broken irq_eoi change.
gpio; Make Intel chipset gpio drivers depend on x86
gpio/cs5535-gpio: Fix section mismatch
spi/rtc-{ds1390,ds3234,m41t94}: Use spi_get_drvdata() for SPI devices
spi/davinci: Support DMA transfers larger than 65535 words
spi/davinci: Use correct length parameter to dma_map_single calls
gpio: Use __devexit at necessary places
gpio: add MODULE_DEVICE_TABLE to pch_gpio and ml_ioh_gpio
gpio/mcp23s08: support mcp23s17 variant
of_mmc_spi: add card detect irq support
spi/omap_mcspi: catch xfers of non-multiple SPI word size
spi/omap_mcspi: Off-by-one error in finding the right divisor
gpio/pca953x: Fix wrong pointer type
spi/pl022: rid dangling labels
spi: add support for SuperH SPI
...
This commit is contained in:
commit
b061c59c27
35 changed files with 1920 additions and 261 deletions
|
|
@ -158,7 +158,7 @@ static int __devinit ds1390_probe(struct spi_device *spi)
|
|||
|
||||
static int __devexit ds1390_remove(struct spi_device *spi)
|
||||
{
|
||||
struct ds1390 *chip = platform_get_drvdata(spi);
|
||||
struct ds1390 *chip = spi_get_drvdata(spi);
|
||||
|
||||
rtc_device_unregister(chip->rtc);
|
||||
kfree(chip);
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ static int __devinit ds3234_probe(struct spi_device *spi)
|
|||
|
||||
static int __devexit ds3234_remove(struct spi_device *spi)
|
||||
{
|
||||
struct rtc_device *rtc = platform_get_drvdata(spi);
|
||||
struct rtc_device *rtc = spi_get_drvdata(spi);
|
||||
|
||||
rtc_device_unregister(rtc);
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ static int __devinit m41t94_probe(struct spi_device *spi)
|
|||
|
||||
static int __devexit m41t94_remove(struct spi_device *spi)
|
||||
{
|
||||
struct rtc_device *rtc = platform_get_drvdata(spi);
|
||||
struct rtc_device *rtc = spi_get_drvdata(spi);
|
||||
|
||||
if (rtc)
|
||||
rtc_device_unregister(rtc);
|
||||
|
|
|
|||
Loading…
Reference in a new issue