aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/flexcan.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/flexcan.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/flexcan.c')
-rw-r--r--drivers/net/can/flexcan.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 9a17965e00fd..0289a6d86f66 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -922,7 +922,7 @@ static const struct net_device_ops flexcan_netdev_ops = {
922 .ndo_start_xmit = flexcan_start_xmit, 922 .ndo_start_xmit = flexcan_start_xmit,
923}; 923};
924 924
925static int __devinit register_flexcandev(struct net_device *dev) 925static int register_flexcandev(struct net_device *dev)
926{ 926{
927 struct flexcan_priv *priv = netdev_priv(dev); 927 struct flexcan_priv *priv = netdev_priv(dev);
928 struct flexcan_regs __iomem *regs = priv->base; 928 struct flexcan_regs __iomem *regs = priv->base;
@@ -968,7 +968,7 @@ static int __devinit register_flexcandev(struct net_device *dev)
968 return err; 968 return err;
969} 969}
970 970
971static void __devexit unregister_flexcandev(struct net_device *dev) 971static void unregister_flexcandev(struct net_device *dev)
972{ 972{
973 unregister_candev(dev); 973 unregister_candev(dev);
974} 974}
@@ -987,7 +987,7 @@ static const struct platform_device_id flexcan_id_table[] = {
987}; 987};
988MODULE_DEVICE_TABLE(platform, flexcan_id_table); 988MODULE_DEVICE_TABLE(platform, flexcan_id_table);
989 989
990static int __devinit flexcan_probe(struct platform_device *pdev) 990static int flexcan_probe(struct platform_device *pdev)
991{ 991{
992 const struct of_device_id *of_id; 992 const struct of_device_id *of_id;
993 const struct flexcan_devtype_data *devtype_data; 993 const struct flexcan_devtype_data *devtype_data;
@@ -1109,7 +1109,7 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
1109 return err; 1109 return err;
1110} 1110}
1111 1111
1112static int __devexit flexcan_remove(struct platform_device *pdev) 1112static int flexcan_remove(struct platform_device *pdev)
1113{ 1113{
1114 struct net_device *dev = platform_get_drvdata(pdev); 1114 struct net_device *dev = platform_get_drvdata(pdev);
1115 struct flexcan_priv *priv = netdev_priv(dev); 1115 struct flexcan_priv *priv = netdev_priv(dev);
@@ -1170,7 +1170,7 @@ static struct platform_driver flexcan_driver = {
1170 .of_match_table = flexcan_of_match, 1170 .of_match_table = flexcan_of_match,
1171 }, 1171 },
1172 .probe = flexcan_probe, 1172 .probe = flexcan_probe,
1173 .remove = __devexit_p(flexcan_remove), 1173 .remove = flexcan_remove,
1174 .suspend = flexcan_suspend, 1174 .suspend = flexcan_suspend,
1175 .resume = flexcan_resume, 1175 .resume = flexcan_resume,
1176 .id_table = flexcan_id_table, 1176 .id_table = flexcan_id_table,