diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 16:13:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 16:13:55 -0500 |
| commit | cff2f741b8ee8a70b208830e330de053efd4fc45 (patch) | |
| tree | 83367ed74d889e2c8179f1f8b5d6f6f73b857982 /drivers/gpio | |
| parent | b0885d01f9ab1274109c02942c881d598f939623 (diff) | |
| parent | 92e9e6d1f9844b73a26215025a922e7d7aeae361 (diff) | |
Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg Kroah-Hartman:
"Here's the large driver core updates for 3.8-rc1.
The biggest thing here is the various __dev* marking removals. This
is going to be a pain for the merge with different subsystem trees, I
know, but all of the patches included here have been ACKed by their
various subsystem maintainers, as they wanted them to go through here.
If this is too much of a pain, I can pull all of them out of this tree
and just send you one with the other fixes/updates and then, after
3.8-rc1 is out, do the rest of the removals to ensure we catch them
all, it's up to you. The merges should all be trivial, and Stephen
has been doing them all in linux-next for a few weeks now quite
easily.
Other than the __dev* marking removals, there's nothing major here,
some firmware loading updates and other minor things in the driver
core.
All of these have (much to Stephen's annoyance), been in linux-next
for a while.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fixed up trivial conflicts in drivers/gpio/gpio-{em,stmpe}.c due to gpio
update.
* tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (93 commits)
modpost.c: Stop checking __dev* section mismatches
init.h: Remove __dev* sections from the kernel
acpi: remove use of __devinit
PCI: Remove __dev* markings
PCI: Always build setup-bus when PCI is enabled
PCI: Move pci_uevent into pci-driver.c
PCI: Remove CONFIG_HOTPLUG ifdefs
unicore32/PCI: Remove CONFIG_HOTPLUG ifdefs
sh/PCI: Remove CONFIG_HOTPLUG ifdefs
powerpc/PCI: Remove CONFIG_HOTPLUG ifdefs
mips/PCI: Remove CONFIG_HOTPLUG ifdefs
microblaze/PCI: Remove CONFIG_HOTPLUG ifdefs
dma: remove use of __devinit
dma: remove use of __devexit_p
firewire: remove use of __devinitdata
firewire: remove use of __devinit
leds: remove use of __devexit
leds: remove use of __devinit
leds: remove use of __devexit_p
mmc: remove use of __devexit
...
Diffstat (limited to 'drivers/gpio')
55 files changed, 157 insertions, 157 deletions
diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c index f05e54258ff..464be961f60 100644 --- a/drivers/gpio/gpio-74x164.c +++ b/drivers/gpio/gpio-74x164.c | |||
| @@ -105,7 +105,7 @@ static int gen_74x164_direction_output(struct gpio_chip *gc, | |||
| 105 | return 0; | 105 | return 0; |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | static int __devinit gen_74x164_probe(struct spi_device *spi) | 108 | static int gen_74x164_probe(struct spi_device *spi) |
| 109 | { | 109 | { |
| 110 | struct gen_74x164_chip *chip; | 110 | struct gen_74x164_chip *chip; |
| 111 | struct gen_74x164_chip_platform_data *pdata; | 111 | struct gen_74x164_chip_platform_data *pdata; |
| @@ -181,7 +181,7 @@ exit_destroy: | |||
| 181 | return ret; | 181 | return ret; |
| 182 | } | 182 | } |
| 183 | 183 | ||
| 184 | static int __devexit gen_74x164_remove(struct spi_device *spi) | 184 | static int gen_74x164_remove(struct spi_device *spi) |
| 185 | { | 185 | { |
| 186 | struct gen_74x164_chip *chip; | 186 | struct gen_74x164_chip *chip; |
| 187 | int ret; | 187 | int ret; |
| @@ -215,7 +215,7 @@ static struct spi_driver gen_74x164_driver = { | |||
| 215 | .of_match_table = of_match_ptr(gen_74x164_dt_ids), | 215 | .of_match_table = of_match_ptr(gen_74x164_dt_ids), |
| 216 | }, | 216 | }, |
| 217 | .probe = gen_74x164_probe, | 217 | .probe = gen_74x164_probe, |
| 218 | .remove = __devexit_p(gen_74x164_remove), | 218 | .remove = gen_74x164_remove, |
| 219 | }; | 219 | }; |
| 220 | module_spi_driver(gen_74x164_driver); | 220 | module_spi_driver(gen_74x164_driver); |
| 221 | 221 | ||
diff --git a/drivers/gpio/gpio-ab8500.c b/drivers/gpio/gpio-ab8500.c index 050c05d9189..983ad425f0a 100644 --- a/drivers/gpio/gpio-ab8500.c +++ b/drivers/gpio/gpio-ab8500.c | |||
| @@ -402,7 +402,7 @@ static void ab8500_gpio_irq_remove(struct ab8500_gpio *ab8500_gpio) | |||
| 402 | } | 402 | } |
| 403 | } | 403 | } |
| 404 | 404 | ||
| 405 | static int __devinit ab8500_gpio_probe(struct platform_device *pdev) | 405 | static int ab8500_gpio_probe(struct platform_device *pdev) |
| 406 | { | 406 | { |
| 407 | struct ab8500_platform_data *ab8500_pdata = | 407 | struct ab8500_platform_data *ab8500_pdata = |
| 408 | dev_get_platdata(pdev->dev.parent); | 408 | dev_get_platdata(pdev->dev.parent); |
| @@ -474,7 +474,7 @@ out_free: | |||
| 474 | * ab8500_gpio_remove() - remove Ab8500-gpio driver | 474 | * ab8500_gpio_remove() - remove Ab8500-gpio driver |
| 475 | * @pdev : Platform device registered | 475 | * @pdev : Platform device registered |
| 476 | */ | 476 | */ |
| 477 | static int __devexit ab8500_gpio_remove(struct platform_device *pdev) | 477 | static int ab8500_gpio_remove(struct platform_device *pdev) |
| 478 | { | 478 | { |
| 479 | struct ab8500_gpio *ab8500_gpio = platform_get_drvdata(pdev); | 479 | struct ab8500_gpio *ab8500_gpio = platform_get_drvdata(pdev); |
| 480 | int ret; | 480 | int ret; |
| @@ -499,7 +499,7 @@ static struct platform_driver ab8500_gpio_driver = { | |||
| 499 | .owner = THIS_MODULE, | 499 | .owner = THIS_MODULE, |
| 500 | }, | 500 | }, |
| 501 | .probe = ab8500_gpio_probe, | 501 | .probe = ab8500_gpio_probe, |
| 502 | .remove = __devexit_p(ab8500_gpio_remove), | 502 | .remove = ab8500_gpio_remove, |
| 503 | }; | 503 | }; |
| 504 | 504 | ||
| 505 | static int __init ab8500_gpio_init(void) | 505 | static int __init ab8500_gpio_init(void) |
diff --git a/drivers/gpio/gpio-adnp.c b/drivers/gpio/gpio-adnp.c index 3df88336415..e60567fc507 100644 --- a/drivers/gpio/gpio-adnp.c +++ b/drivers/gpio/gpio-adnp.c | |||
| @@ -516,7 +516,7 @@ static void adnp_irq_teardown(struct adnp *adnp) | |||
| 516 | irq_domain_remove(adnp->domain); | 516 | irq_domain_remove(adnp->domain); |
| 517 | } | 517 | } |
| 518 | 518 | ||
| 519 | static __devinit int adnp_i2c_probe(struct i2c_client *client, | 519 | static int adnp_i2c_probe(struct i2c_client *client, |
| 520 | const struct i2c_device_id *id) | 520 | const struct i2c_device_id *id) |
| 521 | { | 521 | { |
| 522 | struct device_node *np = client->dev.of_node; | 522 | struct device_node *np = client->dev.of_node; |
| @@ -563,7 +563,7 @@ teardown: | |||
| 563 | return err; | 563 | return err; |
| 564 | } | 564 | } |
| 565 | 565 | ||
| 566 | static __devexit int adnp_i2c_remove(struct i2c_client *client) | 566 | static int adnp_i2c_remove(struct i2c_client *client) |
| 567 | { | 567 | { |
| 568 | struct adnp *adnp = i2c_get_clientdata(client); | 568 | struct adnp *adnp = i2c_get_clientdata(client); |
| 569 | struct device_node *np = client->dev.of_node; | 569 | struct device_node *np = client->dev.of_node; |
| @@ -582,13 +582,13 @@ static __devexit int adnp_i2c_remove(struct i2c_client *client) | |||
| 582 | return 0; | 582 | return 0; |
| 583 | } | 583 | } |
| 584 | 584 | ||
| 585 | static const struct i2c_device_id adnp_i2c_id[] __devinitconst = { | 585 | static const struct i2c_device_id adnp_i2c_id[] = { |
| 586 | { "gpio-adnp" }, | 586 | { "gpio-adnp" }, |
| 587 | { }, | 587 | { }, |
| 588 | }; | 588 | }; |
| 589 | MODULE_DEVICE_TABLE(i2c, adnp_i2c_id); | 589 | MODULE_DEVICE_TABLE(i2c, adnp_i2c_id); |
| 590 | 590 | ||
| 591 | static const struct of_device_id adnp_of_match[] __devinitconst = { | 591 | static const struct of_device_id adnp_of_match[] = { |
| 592 | { .compatible = "ad,gpio-adnp", }, | 592 | { .compatible = "ad,gpio-adnp", }, |
| 593 | { }, | 593 | { }, |
| 594 | }; | 594 | }; |
| @@ -601,7 +601,7 @@ static struct i2c_driver adnp_i2c_driver = { | |||
| 601 | |||
