diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:25:13 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 14:57:40 -0500 |
commit | 84db00ba1ef372b3b06b6f75d0522295acb3054d (patch) | |
tree | 7b1ce3e5fcccb743cd668120ac02c47a92985db9 /drivers/pinctrl | |
parent | 99688ed7744614373e9a13187179319afe3c8db2 (diff) |
pinctrl: remove use of __devinitconst
CONFIG_HOTPLUG is going away as an option so __devinitconst is no
longer needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Barry Song <baohua.song@csr.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r-- | drivers/pinctrl/pinctrl-bcm2835.c | 6 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-sirf.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pinctrl/pinctrl-bcm2835.c b/drivers/pinctrl/pinctrl-bcm2835.c index 7e9be18ec2d2..dd52b6a682c2 100644 --- a/drivers/pinctrl/pinctrl-bcm2835.c +++ b/drivers/pinctrl/pinctrl-bcm2835.c | |||
@@ -372,7 +372,7 @@ static int bcm2835_gpio_to_irq(struct gpio_chip *chip, unsigned offset) | |||
372 | return irq_linear_revmap(pc->irq_domain, offset); | 372 | return irq_linear_revmap(pc->irq_domain, offset); |
373 | } | 373 | } |
374 | 374 | ||
375 | static struct gpio_chip bcm2835_gpio_chip __devinitconst = { | 375 | static struct gpio_chip bcm2835_gpio_chip = { |
376 | .label = MODULE_NAME, | 376 | .label = MODULE_NAME, |
377 | .owner = THIS_MODULE, | 377 | .owner = THIS_MODULE, |
378 | .request = bcm2835_gpio_request, | 378 | .request = bcm2835_gpio_request, |
@@ -931,7 +931,7 @@ static struct pinctrl_desc bcm2835_pinctrl_desc = { | |||
931 | .owner = THIS_MODULE, | 931 | .owner = THIS_MODULE, |
932 | }; | 932 | }; |
933 | 933 | ||
934 | static struct pinctrl_gpio_range bcm2835_pinctrl_gpio_range __devinitconst = { | 934 | static struct pinctrl_gpio_range bcm2835_pinctrl_gpio_range = { |
935 | .name = MODULE_NAME, | 935 | .name = MODULE_NAME, |
936 | .npins = BCM2835_NUM_GPIOS, | 936 | .npins = BCM2835_NUM_GPIOS, |
937 | }; | 937 | }; |
@@ -1052,7 +1052,7 @@ static int __devexit bcm2835_pinctrl_remove(struct platform_device *pdev) | |||
1052 | return 0; | 1052 | return 0; |
1053 | } | 1053 | } |
1054 | 1054 | ||
1055 | static struct of_device_id bcm2835_pinctrl_match[] __devinitconst = { | 1055 | static struct of_device_id bcm2835_pinctrl_match[] = { |
1056 | { .compatible = "brcm,bcm2835-gpio" }, | 1056 | { .compatible = "brcm,bcm2835-gpio" }, |
1057 | {} | 1057 | {} |
1058 | }; | 1058 | }; |
diff --git a/drivers/pinctrl/pinctrl-sirf.c b/drivers/pinctrl/pinctrl-sirf.c index 9ecacf3d0a75..28922c32ad5d 100644 --- a/drivers/pinctrl/pinctrl-sirf.c +++ b/drivers/pinctrl/pinctrl-sirf.c | |||
@@ -1285,7 +1285,7 @@ out_no_gpio_remap: | |||
1285 | return ret; | 1285 | return ret; |
1286 | } | 1286 | } |
1287 | 1287 | ||
1288 | static const struct of_device_id pinmux_ids[] __devinitconst = { | 1288 | static const struct of_device_id pinmux_ids[] = { |
1289 | { .compatible = "sirf,prima2-pinctrl" }, | 1289 | { .compatible = "sirf,prima2-pinctrl" }, |
1290 | {} | 1290 | {} |
1291 | }; | 1291 | }; |