summaryrefslogtreecommitdiff
path: root/drivers/net/can/sja1000/sja1000_of_platform.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 11:16:11 -0800
commit3c8ac0f2ad53a96ac58efe7c98fac2986d081dfc (patch)
treeb6a0420ea67e65977d71f66a8ecb1ac55952dce1 /drivers/net/can/sja1000/sja1000_of_platform.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/sja1000/sja1000_of_platform.c')
-rw-r--r--drivers/net/can/sja1000/sja1000_of_platform.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c
index e45258d4369b..0f5917000aa2 100644
--- a/drivers/net/can/sja1000/sja1000_of_platform.c
+++ b/drivers/net/can/sja1000/sja1000_of_platform.c
@@ -70,7 +70,7 @@ static void sja1000_ofp_write_reg(const struct sja1000_priv *priv,
iowrite8(val, priv->reg_base + reg);
}
-static int __devexit sja1000_ofp_remove(struct platform_device *ofdev)
+static int sja1000_ofp_remove(struct platform_device *ofdev)
{
struct net_device *dev = dev_get_drvdata(&ofdev->dev);
struct sja1000_priv *priv = netdev_priv(dev);
@@ -90,7 +90,7 @@ static int __devexit sja1000_ofp_remove(struct platform_device *ofdev)
return 0;
}
-static int __devinit sja1000_ofp_probe(struct platform_device *ofdev)
+static int sja1000_ofp_probe(struct platform_device *ofdev)
{
struct device_node *np = ofdev->dev.of_node;
struct net_device *dev;
@@ -206,7 +206,7 @@ exit_release_mem:
return err;
}
-static struct of_device_id __devinitdata sja1000_ofp_table[] = {
+static struct of_device_id sja1000_ofp_table[] = {
{.compatible = "nxp,sja1000"},
{},
};
@@ -219,7 +219,7 @@ static struct platform_driver sja1000_ofp_driver = {
.of_match_table = sja1000_ofp_table,
},
.probe = sja1000_ofp_probe,
- .remove = __devexit_p(sja1000_ofp_remove),
+ .remove = sja1000_ofp_remove,
};
module_platform_driver(sja1000_ofp_driver);