aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/grcan.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-03 09:22:44 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-03 14:16:11 -0500
commit3c8ac0f2ad53a96ac58efe7c98fac2986d081dfc (patch)
treeb6a0420ea67e65977d71f66a8ecb1ac55952dce1 /drivers/net/can/grcan.c
parent7c47bab62192d4dd6ba7f7633f2fb94d259e964e (diff)
can: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev* markings will be going away. Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst, and __devexit. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Wolfgang Grandegger <wg@grandegger.com> Cc: Marc Kleine-Budde <mkl@pengutronix.de> Cc: linux-can@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/can/grcan.c')
-rw-r--r--drivers/net/can/grcan.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c
index 391f484fccb..17fbc7a0922 100644
--- a/drivers/net/can/grcan.c
+++ b/drivers/net/can/grcan.c
@@ -1659,7 +1659,7 @@ exit_free_candev:
1659 return err; 1659 return err;
1660} 1660}
1661 1661
1662static int __devinit grcan_probe(struct platform_device *ofdev) 1662static int grcan_probe(struct platform_device *ofdev)
1663{ 1663{
1664 struct device_node *np = ofdev->dev.of_node; 1664 struct device_node *np = ofdev->dev.of_node;
1665 struct resource *res; 1665 struct resource *res;
@@ -1714,7 +1714,7 @@ exit_error:
1714 return err; 1714 return err;
1715} 1715}
1716 1716
1717static int __devexit grcan_remove(struct platform_device *ofdev) 1717static int grcan_remove(struct platform_device *ofdev)
1718{ 1718{
1719 struct net_device *dev = dev_get_drvdata(&ofdev->dev); 1719 struct net_device *dev = dev_get_drvdata(&ofdev->dev);
1720 struct grcan_priv *priv = netdev_priv(dev); 1720 struct grcan_priv *priv = netdev_priv(dev);
@@ -1729,7 +1729,7 @@ static int __devexit grcan_remove(struct platform_device *ofdev)
1729 return 0; 1729 return 0;
1730} 1730}
1731 1731
1732static struct of_device_id grcan_match[] __devinitconst = { 1732static struct of_device_id grcan_match[] = {
1733 {.name = "GAISLER_GRCAN"}, 1733 {.name = "GAISLER_GRCAN"},
1734 {.name = "01_03d"}, 1734 {.name = "01_03d"},
1735 {.name = "GAISLER_GRHCAN"}, 1735 {.name = "GAISLER_GRHCAN"},
@@ -1746,7 +1746,7 @@ static struct platform_driver grcan_driver = {
1746 .of_match_table = grcan_match, 1746 .of_match_table = grcan_match,
1747 }, 1747 },
1748 .probe = grcan_probe, 1748 .probe = grcan_probe,
1749 .remove = __devexit_p(grcan_remove), 1749 .remove = grcan_remove,
1750}; 1750};
1751 1751
1752module_platform_driver(grcan_driver); 1752module_platform_driver(grcan_driver);