summaryrefslogtreecommitdiff
path: root/drivers/net/can/grcan.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-03 18:22:44 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-03 23:16:11 +0400
commit3c8ac0f2ad53a96ac58efe7c98fac2986d081dfc (patch)
treeb6a0420ea67e65977d71f66a8ecb1ac55952dce1 /drivers/net/can/grcan.c
parent7c47bab62192d4dd6ba7f7633f2fb94d259e964e (diff)
downloadlinux-3c8ac0f2ad53a96ac58efe7c98fac2986d081dfc.tar.xz
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 391f484fccb7..17fbc7a09224 100644
--- a/drivers/net/can/grcan.c
+++ b/drivers/net/can/grcan.c
@@ -1659,7 +1659,7 @@ exit_free_candev:
return err;
}
-static int __devinit grcan_probe(struct platform_device *ofdev)
+static int grcan_probe(struct platform_device *ofdev)
{
struct device_node *np = ofdev->dev.of_node;
struct resource *res;
@@ -1714,7 +1714,7 @@ exit_error:
return err;
}
-static int __devexit grcan_remove(struct platform_device *ofdev)
+static int grcan_remove(struct platform_device *ofdev)
{
struct net_device *dev = dev_get_drvdata(&ofdev->dev);
struct grcan_priv *priv = netdev_priv(dev);
@@ -1729,7 +1729,7 @@ static int __devexit grcan_remove(struct platform_device *ofdev)
return 0;
}
-static struct of_device_id grcan_match[] __devinitconst = {
+static struct of_device_id grcan_match[] = {
{.name = "GAISLER_GRCAN"},
{.name = "01_03d"},
{.name = "GAISLER_GRHCAN"},
@@ -1746,7 +1746,7 @@ static struct platform_driver grcan_driver = {
.of_match_table = grcan_match,
},
.probe = grcan_probe,
- .remove = __devexit_p(grcan_remove),
+ .remove = grcan_remove,
};
module_platform_driver(grcan_driver);