Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e2ff36b authored by Bill Pemberton's avatar Bill Pemberton Committed by John W. Linville
Browse files

rtlwifi: 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b74324d1

drivers/net/wireless/rtlwifi/pci.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1756,7 +1756,7 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev, 
	return true;

	return true;

}

}





int __devinit rtl_pci_probe(struct pci_dev *pdev,

int rtl_pci_probe(struct pci_dev *pdev,

			    const struct pci_device_id *id)

			    const struct pci_device_id *id)

{

{

	struct ieee80211_hw *hw = NULL;

	struct ieee80211_hw *hw = NULL;

drivers/net/wireless/rtlwifi/pci.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -236,7 +236,7 @@ int rtl_pci_reset_trx_ring(struct ieee80211_hw *hw); 




extern struct rtl_intf_ops rtl_pci_ops;

extern struct rtl_intf_ops rtl_pci_ops;





int __devinit rtl_pci_probe(struct pci_dev *pdev,

int rtl_pci_probe(struct pci_dev *pdev,

			    const struct pci_device_id *id);

			    const struct pci_device_id *id);

void rtl_pci_disconnect(struct pci_dev *pdev);

void rtl_pci_disconnect(struct pci_dev *pdev);

#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_PM_SLEEP

drivers/net/wireless/rtlwifi/rtl8192de/sw.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -352,7 +352,7 @@ static struct rtl_hal_cfg rtl92de_hal_cfg = { 
	.maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15,

	.maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15,

};

};





static struct pci_device_id rtl92de_pci_ids[] __devinitdata = {

static struct pci_device_id rtl92de_pci_ids[] = {

	{RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8193, rtl92de_hal_cfg)},

	{RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8193, rtl92de_hal_cfg)},

	{RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x002B, rtl92de_hal_cfg)},

	{RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x002B, rtl92de_hal_cfg)},

	{},

	{},

drivers/net/wireless/rtlwifi/rtl8192se/sw.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -400,7 +400,7 @@ static struct rtl_hal_cfg rtl92se_hal_cfg = { 
	.maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15,

	.maps[RTL_RC_HT_RATEMCS15] = DESC92_RATEMCS15,

};

};





static struct pci_device_id rtl92se_pci_ids[] __devinitdata = {

static struct pci_device_id rtl92se_pci_ids[] = {

	{RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8192, rtl92se_hal_cfg)},

	{RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8192, rtl92se_hal_cfg)},

	{RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8171, rtl92se_hal_cfg)},

	{RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8171, rtl92se_hal_cfg)},

	{RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8172, rtl92se_hal_cfg)},

	{RTL_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8172, rtl92se_hal_cfg)},

drivers/net/wireless/rtlwifi/usb.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -940,7 +940,7 @@ static struct rtl_intf_ops rtl_usb_ops = { 
	.waitq_insert = rtl_usb_tx_chk_waitq_insert,

	.waitq_insert = rtl_usb_tx_chk_waitq_insert,

};

};





int __devinit rtl_usb_probe(struct usb_interface *intf,

int rtl_usb_probe(struct usb_interface *intf,

			const struct usb_device_id *id)

			const struct usb_device_id *id)

{

{

	int err;

	int err;