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.
Unified · Split
| @@ -1756,7 +1756,7 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev, · 1755 unmodified lines | |||
| 1756 | return true; | 1756 | return true; |
| 1757 | } | 1757 | } |
| 1758 | 1758 | ||
| 1759 | int __devinit rtl_pci_probe(struct pci_dev *pdev, | 1759 | int rtl_pci_probe(struct pci_dev *pdev, |
| 1760 | const struct pci_device_id *id) | 1760 | const struct pci_device_id *id) |
| 1761 | { | 1761 | { |
| 1762 | struct ieee80211_hw *hw = NULL; | 1762 | struct ieee80211_hw *hw = NULL; |
| @@ -236,7 +236,7 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw); · 235 unmodified lines | |||
| 236 | 236 | ||
| 237 | extern struct rtl_intf_ops rtl_pci_ops; | 237 | extern struct rtl_intf_ops rtl_pci_ops; |
| 238 | 238 | ||
| 239 | int __devinit rtl_pci_probe(struct pci_dev *pdev, | 239 | int rtl_pci_probe(struct pci_dev *pdev, |
| 240 | const struct pci_device_id *id); | 240 | const struct pci_device_id *id); |
| 241 | void rtl_pci_disconnect(struct pci_dev *pdev); | 241 | void rtl_pci_disconnect(struct pci_dev *pdev); |
| 242 | #ifdef CONFIG_PM_SLEEP | 242 | #ifdef CONFIG_PM_SLEEP |
| @@ -352,7 +352,7 @@ static struct rtl_hal_cfg rtl92de_hal_cfg = { · 351 unmodified lines | |||
| 352 | .maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15, | 352 | .maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15, |
| 353 | }; | 353 | }; |
| 354 | 354 | ||
| 355 | static struct pci_device_id rtl92de_pci_ids[] __devinitdata = { | 355 | static struct pci_device_id rtl92de_pci_ids[] = { |
| 356 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8193, rtl92de_hal_cfg)}, | 356 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8193, rtl92de_hal_cfg)}, |
| 357 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x002B, rtl92de_hal_cfg)}, | 357 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x002B, rtl92de_hal_cfg)}, |
| 358 | {}, | 358 | {}, |
| @@ -400,7 +400,7 @@ static struct rtl_hal_cfg rtl92se_hal_cfg = { · 399 unmodified lines | |||
| 400 | .maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15, | 400 | .maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15, |
| 401 | }; | 401 | }; |
| 402 | 402 | ||
| 403 | static struct pci_device_id rtl92se_pci_ids[] __devinitdata = { | 403 | static struct pci_device_id rtl92se_pci_ids[] = { |
| 404 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8192, rtl92se_hal_cfg)}, | 404 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8192, rtl92se_hal_cfg)}, |
| 405 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8171, rtl92se_hal_cfg)}, | 405 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8171, rtl92se_hal_cfg)}, |
| 406 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8172, rtl92se_hal_cfg)}, | 406 | {RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8172, rtl92se_hal_cfg)}, |
| @@ -940,7 +940,7 @@ static struct rtl_intf_ops rtl_usb_ops = { · 939 unmodified lines | |||
| 940 | .waitq_insert = rtl_usb_tx_chk_waitq_insert, | 940 | .waitq_insert = rtl_usb_tx_chk_waitq_insert, |
| 941 | }; | 941 | }; |
| 942 | 942 | ||
| 943 | int __devinit rtl_usb_probe(struct usb_interface *intf, | 943 | int rtl_usb_probe(struct usb_interface *intf, |
| 944 | const struct usb_device_id *id) | 944 | const struct usb_device_id *id) |
| 945 | { | 945 | { |
| 946 | int err; | 946 | int err; |
| @@ -156,7 +156,7 @@ struct rtl_usb_priv { · 155 unmodified lines | |||
| 156 | 156 | ||
| 157 | 157 | ||
| 158 | 158 | ||
| 159 | int __devinit rtl_usb_probe(struct usb_interface *intf, | 159 | int rtl_usb_probe(struct usb_interface *intf, |
| 160 | const struct usb_device_id *id); | 160 | const struct usb_device_id *id); |
| 161 | void rtl_usb_disconnect(struct usb_interface *intf); | 161 | void rtl_usb_disconnect(struct usb_interface *intf); |
| 162 | int rtl_usb_suspend(struct usb_interface *pusb_intf, pm_message_t message); | 162 | int rtl_usb_suspend(struct usb_interface *pusb_intf, pm_message_t message); |