diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:24:27 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-28 14:55:55 -0500 |
commit | 99688ed7744614373e9a13187179319afe3c8db2 (patch) | |
tree | a09c75f14e96daf9d0095f07087816cd8f08d36a | |
parent | 2a36f08636665d63ec2bfa49a815509e71d44eba (diff) |
pinctrl: remove use of __devinitdata
CONFIG_HOTPLUG is going away as an option so __devinitdata is no
longer needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Viresh Kumar <viresh.linux@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/pinctrl/pinctrl-imx23.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-imx28.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-imx35.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-imx51.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-imx53.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-imx6q.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-single.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-tegra20.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-tegra30.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/spear/pinctrl-spear1310.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/spear/pinctrl-spear1340.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/spear/pinctrl-spear300.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/spear/pinctrl-spear310.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/spear/pinctrl-spear320.c | 2 |
14 files changed, 14 insertions, 14 deletions
diff --git a/drivers/pinctrl/pinctrl-imx23.c b/drivers/pinctrl/pinctrl-imx23.c index 67e1b3bb70da..04364f7822b7 100644 --- a/drivers/pinctrl/pinctrl-imx23.c +++ b/drivers/pinctrl/pinctrl-imx23.c | |||
@@ -272,7 +272,7 @@ static int __devinit imx23_pinctrl_probe(struct platform_device *pdev) | |||
272 | return mxs_pinctrl_probe(pdev, &imx23_pinctrl_data); | 272 | return mxs_pinctrl_probe(pdev, &imx23_pinctrl_data); |
273 | } | 273 | } |
274 | 274 | ||
275 | static struct of_device_id imx23_pinctrl_of_match[] __devinitdata = { | 275 | static struct of_device_id imx23_pinctrl_of_match[] = { |
276 | { .compatible = "fsl,imx23-pinctrl", }, | 276 | { .compatible = "fsl,imx23-pinctrl", }, |
277 | { /* sentinel */ } | 277 | { /* sentinel */ } |
278 | }; | 278 | }; |
diff --git a/drivers/pinctrl/pinctrl-imx28.c b/drivers/pinctrl/pinctrl-imx28.c index feeb4b9f802a..e1af2ba89004 100644 --- a/drivers/pinctrl/pinctrl-imx28.c +++ b/drivers/pinctrl/pinctrl-imx28.c | |||
@@ -388,7 +388,7 @@ static int __devinit imx28_pinctrl_probe(struct platform_device *pdev) | |||
388 | return mxs_pinctrl_probe(pdev, &imx28_pinctrl_data); | 388 | return mxs_pinctrl_probe(pdev, &imx28_pinctrl_data); |
389 | } | 389 | } |
390 | 390 | ||
391 | static struct of_device_id imx28_pinctrl_of_match[] __devinitdata = { | 391 | static struct of_device_id imx28_pinctrl_of_match[] = { |
392 | { .compatible = "fsl,imx28-pinctrl", }, | 392 | { .compatible = "fsl,imx28-pinctrl", }, |
393 | { /* sentinel */ } | 393 | { /* sentinel */ } |
394 | }; | 394 | }; |
diff --git a/drivers/pinctrl/pinctrl-imx35.c b/drivers/pinctrl/pinctrl-imx35.c index a88d087ac0dd..1dbf5278acec 100644 --- a/drivers/pinctrl/pinctrl-imx35.c +++ b/drivers/pinctrl/pinctrl-imx35.c | |||
@@ -1559,7 +1559,7 @@ static struct imx_pinctrl_soc_info imx35_pinctrl_info = { | |||
1559 | .npin_regs = ARRAY_SIZE(imx35_pin_regs), | 1559 | .npin_regs = ARRAY_SIZE(imx35_pin_regs), |
1560 | }; | 1560 | }; |
1561 | 1561 | ||
1562 | static struct of_device_id imx35_pinctrl_of_match[] __devinitdata = { | 1562 | static struct of_device_id imx35_pinctrl_of_match[] = { |
1563 | { .compatible = "fsl,imx35-iomuxc", }, | 1563 | { .compatible = "fsl,imx35-iomuxc", }, |
1564 | { /* sentinel */ } | 1564 | { /* sentinel */ } |
1565 | }; | 1565 | }; |
diff --git a/drivers/pinctrl/pinctrl-imx51.c b/drivers/pinctrl/pinctrl-imx51.c index 5c489487a054..131216558a7b 100644 --- a/drivers/pinctrl/pinctrl-imx51.c +++ b/drivers/pinctrl/pinctrl-imx51.c | |||
@@ -1286,7 +1286,7 @@ static struct imx_pinctrl_soc_info imx51_pinctrl_info = { | |||
1286 | .npin_regs = ARRAY_SIZE(imx51_pin_regs), | 1286 | .npin_regs = ARRAY_SIZE(imx51_pin_regs), |
1287 | }; | 1287 | }; |
1288 | 1288 | ||
1289 | static struct of_device_id imx51_pinctrl_of_match[] __devinitdata = { | 1289 | static struct of_device_id imx51_pinctrl_of_match[] = { |
1290 | { .compatible = "fsl,imx51-iomuxc", }, | 1290 | { .compatible = "fsl,imx51-iomuxc", }, |
1291 | { /* sentinel */ } | 1291 | { /* sentinel */ } |
1292 | }; | 1292 | }; |
diff --git a/drivers/pinctrl/pinctrl-imx53.c b/drivers/pinctrl/pinctrl-imx53.c index 8e5c15f70895..ec4048691775 100644 --- a/drivers/pinctrl/pinctrl-imx53.c +++ b/drivers/pinctrl/pinctrl-imx53.c | |||
@@ -1613,7 +1613,7 @@ static struct imx_pinctrl_soc_info imx53_pinctrl_info = { | |||
1613 | .npin_regs = ARRAY_SIZE(imx53_pin_regs), | 1613 | .npin_regs = ARRAY_SIZE(imx53_pin_regs), |
1614 | }; | 1614 | }; |
1615 | 1615 | ||
1616 | static struct of_device_id imx53_pinctrl_of_match[] __devinitdata = { | 1616 | static struct of_device_id imx53_pinctrl_of_match[] = { |
1617 | { .compatible = "fsl,imx53-iomuxc", }, | 1617 | { .compatible = "fsl,imx53-iomuxc", }, |
1618 | { /* sentinel */ } | 1618 | { /* sentinel */ } |
1619 | }; | 1619 | }; |
diff --git a/drivers/pinctrl/pinctrl-imx6q.c b/drivers/pinctrl/pinctrl-imx6q.c index 831dae675330..844ab13c93a3 100644 --- a/drivers/pinctrl/pinctrl-imx6q.c +++ b/drivers/pinctrl/pinctrl-imx6q.c | |||
@@ -2297,7 +2297,7 @@ static struct imx_pinctrl_soc_info imx6q_pinctrl_info = { | |||
2297 | .npin_regs = ARRAY_SIZE(imx6q_pin_regs), | 2297 | .npin_regs = ARRAY_SIZE(imx6q_pin_regs), |
2298 | }; | 2298 | }; |
2299 | 2299 | ||
2300 | static struct of_device_id imx6q_pinctrl_of_match[] __devinitdata = { | 2300 | static struct of_device_id imx6q_pinctrl_of_match[] = { |
2301 | { .compatible = "fsl,imx6q-iomuxc", }, | 2301 | { .compatible = "fsl,imx6q-iomuxc", }, |
2302 | { /* sentinel */ } | 2302 | { /* sentinel */ } |
2303 | }; | 2303 | }; |
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index a0d9584a08f7..2e7cbb9b0c91 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c | |||
@@ -998,7 +998,7 @@ static int __devexit pcs_remove(struct platform_device *pdev) | |||
998 | return 0; | 998 | return 0; |
999 | } | 999 | } |
1000 | 1000 | ||
1001 | static struct of_device_id pcs_of_match[] __devinitdata = { | 1001 | static struct of_device_id pcs_of_match[] = { |
1002 | { .compatible = DRIVER_NAME, }, | 1002 | { .compatible = DRIVER_NAME, }, |
1003 | { }, | 1003 | { }, |
1004 | }; | 1004 | }; |
diff --git a/drivers/pinctrl/pinctrl-tegra20.c b/drivers/pinctrl/pinctrl-tegra20.c index e749dedd8edb..1524bfd66602 100644 --- a/drivers/pinctrl/pinctrl-tegra20.c +++ b/drivers/pinctrl/pinctrl-tegra20.c | |||
@@ -2861,7 +2861,7 @@ static int __devinit tegra20_pinctrl_probe(struct platform_device *pdev) | |||
2861 | return tegra_pinctrl_probe(pdev, &tegra20_pinctrl); | 2861 | return tegra_pinctrl_probe(pdev, &tegra20_pinctrl); |
2862 | } | 2862 | } |
2863 | 2863 | ||
2864 | static struct of_device_id tegra20_pinctrl_of_match[] __devinitdata = { | 2864 | static struct of_device_id tegra20_pinctrl_of_match[] = { |
2865 | { .compatible = "nvidia,tegra20-pinmux", }, | 2865 | { .compatible = "nvidia,tegra20-pinmux", }, |
2866 | { }, | 2866 | { }, |
2867 | }; | 2867 | }; |
diff --git a/drivers/pinctrl/pinctrl-tegra30.c b/drivers/pinctrl/pinctrl-tegra30.c index dc1e229b05fd..cf579ebf346f 100644 --- a/drivers/pinctrl/pinctrl-tegra30.c +++ b/drivers/pinctrl/pinctrl-tegra30.c | |||
@@ -3727,7 +3727,7 @@ static int __devinit tegra30_pinctrl_probe(struct platform_device *pdev) | |||
3727 | return tegra_pinctrl_probe(pdev, &tegra30_pinctrl); | 3727 | return tegra_pinctrl_probe(pdev, &tegra30_pinctrl); |
3728 | } | 3728 | } |
3729 | 3729 | ||
3730 | static struct of_device_id tegra30_pinctrl_of_match[] __devinitdata = { | 3730 | static struct of_device_id tegra30_pinctrl_of_match[] = { |
3731 | { .compatible = "nvidia,tegra30-pinmux", }, | 3731 | { .compatible = "nvidia,tegra30-pinmux", }, |
3732 | { }, | 3732 | { }, |
3733 | }; | 3733 | }; |
diff --git a/drivers/pinctrl/spear/pinctrl-spear1310.c b/drivers/pinctrl/spear/pinctrl-spear1310.c index c256777bb957..1df013d2abfb 100644 --- a/drivers/pinctrl/spear/pinctrl-spear1310.c +++ b/drivers/pinctrl/spear/pinctrl-spear1310.c | |||
@@ -2428,7 +2428,7 @@ static struct spear_pinctrl_machdata spear1310_machdata = { | |||
2428 | .modes_supported = false, | 2428 | .modes_supported = false, |
2429 | }; | 2429 | }; |
2430 | 2430 | ||
2431 | static struct of_device_id spear1310_pinctrl_of_match[] __devinitdata = { | 2431 | static struct of_device_id spear1310_pinctrl_of_match[] = { |
2432 | { | 2432 | { |
2433 | .compatible = "st,spear1310-pinmux", | 2433 | .compatible = "st,spear1310-pinmux", |
2434 | }, | 2434 | }, |
diff --git a/drivers/pinctrl/spear/pinctrl-spear1340.c b/drivers/pinctrl/spear/pinctrl-spear1340.c index b9f72948c05d..5ef9801ea084 100644 --- a/drivers/pinctrl/spear/pinctrl-spear1340.c +++ b/drivers/pinctrl/spear/pinctrl-spear1340.c | |||
@@ -1981,7 +1981,7 @@ static struct spear_pinctrl_machdata spear1340_machdata = { | |||
1981 | .modes_supported = false, | 1981 | .modes_supported = false, |
1982 | }; | 1982 | }; |
1983 | 1983 | ||
1984 | static struct of_device_id spear1340_pinctrl_of_match[] __devinitdata = { | 1984 | static struct of_device_id spear1340_pinctrl_of_match[] = { |
1985 | { | 1985 | { |
1986 | .compatible = "st,spear1340-pinmux", | 1986 | .compatible = "st,spear1340-pinmux", |
1987 | }, | 1987 | }, |
diff --git a/drivers/pinctrl/spear/pinctrl-spear300.c b/drivers/pinctrl/spear/pinctrl-spear300.c index 55fddb2c5a6e..6652fcd39fcc 100644 --- a/drivers/pinctrl/spear/pinctrl-spear300.c +++ b/drivers/pinctrl/spear/pinctrl-spear300.c | |||
@@ -646,7 +646,7 @@ static struct spear_function *spear300_functions[] = { | |||
646 | &gpio1_function, | 646 | &gpio1_function, |
647 | }; | 647 | }; |
648 | 648 | ||
649 | static struct of_device_id spear300_pinctrl_of_match[] __devinitdata = { | 649 | static struct of_device_id spear300_pinctrl_of_match[] = { |
650 | { | 650 | { |
651 | .compatible = "st,spear300-pinmux", | 651 | .compatible = "st,spear300-pinmux", |
652 | }, | 652 | }, |
diff --git a/drivers/pinctrl/spear/pinctrl-spear310.c b/drivers/pinctrl/spear/pinctrl-spear310.c index 53b27ca5f22d..6066e795d0b3 100644 --- a/drivers/pinctrl/spear/pinctrl-spear310.c +++ b/drivers/pinctrl/spear/pinctrl-spear310.c | |||
@@ -371,7 +371,7 @@ static struct spear_function *spear310_functions[] = { | |||
371 | &tdm_function, | 371 | &tdm_function, |
372 | }; | 372 | }; |
373 | 373 | ||
374 | static struct of_device_id spear310_pinctrl_of_match[] __devinitdata = { | 374 | static struct of_device_id spear310_pinctrl_of_match[] = { |
375 | { | 375 | { |
376 | .compatible = "st,spear310-pinmux", | 376 | .compatible = "st,spear310-pinmux", |
377 | }, | 377 | }, |
diff --git a/drivers/pinctrl/spear/pinctrl-spear320.c b/drivers/pinctrl/spear/pinctrl-spear320.c index 92df44e6eb39..d154cba00898 100644 --- a/drivers/pinctrl/spear/pinctrl-spear320.c +++ b/drivers/pinctrl/spear/pinctrl-spear320.c | |||
@@ -3410,7 +3410,7 @@ static struct spear_function *spear320_functions[] = { | |||
3410 | &i2c2_function, | 3410 | &i2c2_function, |
3411 | }; | 3411 | }; |
3412 | 3412 | ||
3413 | static struct of_device_id spear320_pinctrl_of_match[] __devinitdata = { | 3413 | static struct of_device_id spear320_pinctrl_of_match[] = { |
3414 | { | 3414 | { |
3415 | .compatible = "st,spear320-pinmux", | 3415 | .compatible = "st,spear320-pinmux", |
3416 | }, | 3416 | }, |