diff options
| author | David S. Miller <davem@davemloft.net> | 2012-12-04 00:35:28 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-04 00:35:28 +0400 |
| commit | 682d7978aee072f411fc747d32954a8371dd7b1b (patch) | |
| tree | eeda0abd33caeb14d0adbc5ffd2a9a8cbb4b2ac8 /drivers/net/irda/sh_sir.c | |
| parent | a5a81f0b9025867efb999d14a8dfc1907c5a4c3b (diff) | |
| parent | 9f9a12f8ca79839c948464a37c5b557808278708 (diff) | |
| download | linux-682d7978aee072f411fc747d32954a8371dd7b1b.tar.xz | |
Merge tag 'dev_removal' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/net-next
Networking: Remove __dev* markings from the networking drivers
This is a series of patches that remove the dev* attributes for all
networking drivers, with the exception of wireless drivers, those are in
a different branch.
Use of __devinit, __devexit_p, __devinitdata, __devinitconst, and
__devexit are no longer needed since CONFIG_HOTPLUG is being removed as
an option.
Note, there are some devinit compiler section mismatch warnings due to
this series, but they are fixed up when merged with my driver-next
branch, which fixes the PCI device id warnings, and removes the modpost
detection, as it's no longer needed.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/irda/sh_sir.c')
| -rw-r--r-- | drivers/net/irda/sh_sir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/irda/sh_sir.c b/drivers/net/irda/sh_sir.c index 624ac1939e85..24aefcd84065 100644 --- a/drivers/net/irda/sh_sir.c +++ b/drivers/net/irda/sh_sir.c @@ -705,7 +705,7 @@ static const struct net_device_ops sh_sir_ndo = { ************************************************************************/ -static int __devinit sh_sir_probe(struct platform_device *pdev) +static int sh_sir_probe(struct platform_device *pdev) { struct net_device *ndev; struct sh_sir_self *self; @@ -783,7 +783,7 @@ exit: return err; } -static int __devexit sh_sir_remove(struct platform_device *pdev) +static int sh_sir_remove(struct platform_device *pdev) { struct net_device *ndev = platform_get_drvdata(pdev); struct sh_sir_self *self = netdev_priv(ndev); @@ -803,7 +803,7 @@ static int __devexit sh_sir_remove(struct platform_device *pdev) static struct platform_driver sh_sir_driver = { .probe = sh_sir_probe, - .remove = __devexit_p(sh_sir_remove), + .remove = sh_sir_remove, .driver = { .name = DRIVER_NAME, }, |