diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-03 09:22:44 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 14:16:11 -0500 |
commit | 3c8ac0f2ad53a96ac58efe7c98fac2986d081dfc (patch) | |
tree | b6a0420ea67e65977d71f66a8ecb1ac55952dce1 /drivers/net/can/c_can/c_can_pci.c | |
parent | 7c47bab62192d4dd6ba7f7633f2fb94d259e964e (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/c_can/c_can_pci.c')
-rw-r--r-- | drivers/net/can/c_can/c_can_pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/can/c_can/c_can_pci.c b/drivers/net/can/c_can/c_can_pci.c index 3d7830bcd2bf..a1f263170683 100644 --- a/drivers/net/can/c_can/c_can_pci.c +++ b/drivers/net/can/c_can/c_can_pci.c | |||
@@ -63,7 +63,7 @@ static void c_can_pci_write_reg_aligned_to_32bit(struct c_can_priv *priv, | |||
63 | writew(val, priv->base + 2 * priv->regs[index]); | 63 | writew(val, priv->base + 2 * priv->regs[index]); |
64 | } | 64 | } |
65 | 65 | ||
66 | static int __devinit c_can_pci_probe(struct pci_dev *pdev, | 66 | static int c_can_pci_probe(struct pci_dev *pdev, |
67 | const struct pci_device_id *ent) | 67 | const struct pci_device_id *ent) |
68 | { | 68 | { |
69 | struct c_can_pci_data *c_can_pci_data = (void *)ent->driver_data; | 69 | struct c_can_pci_data *c_can_pci_data = (void *)ent->driver_data; |
@@ -174,7 +174,7 @@ out: | |||
174 | return ret; | 174 | return ret; |
175 | } | 175 | } |
176 | 176 | ||
177 | static void __devexit c_can_pci_remove(struct pci_dev *pdev) | 177 | static void c_can_pci_remove(struct pci_dev *pdev) |
178 | { | 178 | { |
179 | struct net_device *dev = pci_get_drvdata(pdev); | 179 | struct net_device *dev = pci_get_drvdata(pdev); |
180 | struct c_can_priv *priv = netdev_priv(dev); | 180 | struct c_can_priv *priv = netdev_priv(dev); |
@@ -210,7 +210,7 @@ static struct pci_driver c_can_pci_driver = { | |||
210 | .name = KBUILD_MODNAME, | 210 | .name = KBUILD_MODNAME, |
211 | .id_table = c_can_pci_tbl, | 211 | .id_table = c_can_pci_tbl, |
212 | .probe = c_can_pci_probe, | 212 | .probe = c_can_pci_probe, |
213 | .remove = __devexit_p(c_can_pci_remove), | 213 | .remove = c_can_pci_remove, |
214 | }; | 214 | }; |
215 | 215 | ||
216 | module_pci_driver(c_can_pci_driver); | 216 | module_pci_driver(c_can_pci_driver); |