Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

p54: 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: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by

Bill Pemberton and committed by
John W. Linville
337b563f baa366cd

+9 -9
+3 -3
drivers/net/wireless/p54/p54pci.c
··· 540 540 pci_dev_put(pdev); 541 541 } 542 542 543 - static int __devinit p54p_probe(struct pci_dev *pdev, 543 + static int p54p_probe(struct pci_dev *pdev, 544 544 const struct pci_device_id *id) 545 545 { 546 546 struct p54p_priv *priv; ··· 639 639 return err; 640 640 } 641 641 642 - static void __devexit p54p_remove(struct pci_dev *pdev) 642 + static void p54p_remove(struct pci_dev *pdev) 643 643 { 644 644 struct ieee80211_hw *dev = pci_get_drvdata(pdev); 645 645 struct p54p_priv *priv; ··· 692 692 .name = "p54pci", 693 693 .id_table = p54p_table, 694 694 .probe = p54p_probe, 695 - .remove = __devexit_p(p54p_remove), 695 + .remove = p54p_remove, 696 696 .driver.pm = P54P_PM_OPS, 697 697 }; 698 698
+3 -3
drivers/net/wireless/p54/p54spi.c
··· 595 595 cancel_work_sync(&priv->work); 596 596 } 597 597 598 - static int __devinit p54spi_probe(struct spi_device *spi) 598 + static int p54spi_probe(struct spi_device *spi) 599 599 { 600 600 struct p54s_priv *priv = NULL; 601 601 struct ieee80211_hw *hw; ··· 683 683 return ret; 684 684 } 685 685 686 - static int __devexit p54spi_remove(struct spi_device *spi) 686 + static int p54spi_remove(struct spi_device *spi) 687 687 { 688 688 struct p54s_priv *priv = dev_get_drvdata(&spi->dev); 689 689 ··· 710 710 }, 711 711 712 712 .probe = p54spi_probe, 713 - .remove = __devexit_p(p54spi_remove), 713 + .remove = p54spi_remove, 714 714 }; 715 715 716 716 static int __init p54spi_init(void)
+3 -3
drivers/net/wireless/p54/p54usb.c
··· 986 986 return err; 987 987 } 988 988 989 - static int __devinit p54u_probe(struct usb_interface *intf, 989 + static int p54u_probe(struct usb_interface *intf, 990 990 const struct usb_device_id *id) 991 991 { 992 992 struct usb_device *udev = interface_to_usbdev(intf); ··· 1057 1057 return err; 1058 1058 } 1059 1059 1060 - static void __devexit p54u_disconnect(struct usb_interface *intf) 1060 + static void p54u_disconnect(struct usb_interface *intf) 1061 1061 { 1062 1062 struct ieee80211_hw *dev = usb_get_intfdata(intf); 1063 1063 struct p54u_priv *priv; ··· 1131 1131 .name = "p54usb", 1132 1132 .id_table = p54u_table, 1133 1133 .probe = p54u_probe, 1134 - .disconnect = __devexit_p(p54u_disconnect), 1134 + .disconnect = p54u_disconnect, 1135 1135 .pre_reset = p54u_pre_reset, 1136 1136 .post_reset = p54u_post_reset, 1137 1137 #ifdef CONFIG_PM