mirror of https://gitee.com/openkylin/linux.git
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>
This commit is contained in:
parent
baa366cda6
commit
337b563f72
|
@ -540,7 +540,7 @@ static void p54p_firmware_step2(const struct firmware *fw,
|
|||
pci_dev_put(pdev);
|
||||
}
|
||||
|
||||
static int __devinit p54p_probe(struct pci_dev *pdev,
|
||||
static int p54p_probe(struct pci_dev *pdev,
|
||||
const struct pci_device_id *id)
|
||||
{
|
||||
struct p54p_priv *priv;
|
||||
|
@ -639,7 +639,7 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
|
|||
return err;
|
||||
}
|
||||
|
||||
static void __devexit p54p_remove(struct pci_dev *pdev)
|
||||
static void p54p_remove(struct pci_dev *pdev)
|
||||
{
|
||||
struct ieee80211_hw *dev = pci_get_drvdata(pdev);
|
||||
struct p54p_priv *priv;
|
||||
|
@ -692,7 +692,7 @@ static struct pci_driver p54p_driver = {
|
|||
.name = "p54pci",
|
||||
.id_table = p54p_table,
|
||||
.probe = p54p_probe,
|
||||
.remove = __devexit_p(p54p_remove),
|
||||
.remove = p54p_remove,
|
||||
.driver.pm = P54P_PM_OPS,
|
||||
};
|
||||
|
||||
|
|
|
@ -595,7 +595,7 @@ static void p54spi_op_stop(struct ieee80211_hw *dev)
|
|||
cancel_work_sync(&priv->work);
|
||||
}
|
||||
|
||||
static int __devinit p54spi_probe(struct spi_device *spi)
|
||||
static int p54spi_probe(struct spi_device *spi)
|
||||
{
|
||||
struct p54s_priv *priv = NULL;
|
||||
struct ieee80211_hw *hw;
|
||||
|
@ -683,7 +683,7 @@ static int __devinit p54spi_probe(struct spi_device *spi)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int __devexit p54spi_remove(struct spi_device *spi)
|
||||
static int p54spi_remove(struct spi_device *spi)
|
||||
{
|
||||
struct p54s_priv *priv = dev_get_drvdata(&spi->dev);
|
||||
|
||||
|
@ -710,7 +710,7 @@ static struct spi_driver p54spi_driver = {
|
|||
},
|
||||
|
||||
.probe = p54spi_probe,
|
||||
.remove = __devexit_p(p54spi_remove),
|
||||
.remove = p54spi_remove,
|
||||
};
|
||||
|
||||
static int __init p54spi_init(void)
|
||||
|
|
|
@ -986,7 +986,7 @@ static int p54u_load_firmware(struct ieee80211_hw *dev,
|
|||
return err;
|
||||
}
|
||||
|
||||
static int __devinit p54u_probe(struct usb_interface *intf,
|
||||
static int p54u_probe(struct usb_interface *intf,
|
||||
const struct usb_device_id *id)
|
||||
{
|
||||
struct usb_device *udev = interface_to_usbdev(intf);
|
||||
|
@ -1057,7 +1057,7 @@ static int __devinit p54u_probe(struct usb_interface *intf,
|
|||
return err;
|
||||
}
|
||||
|
||||
static void __devexit p54u_disconnect(struct usb_interface *intf)
|
||||
static void p54u_disconnect(struct usb_interface *intf)
|
||||
{
|
||||
struct ieee80211_hw *dev = usb_get_intfdata(intf);
|
||||
struct p54u_priv *priv;
|
||||
|
@ -1131,7 +1131,7 @@ static struct usb_driver p54u_driver = {
|
|||
.name = "p54usb",
|
||||
.id_table = p54u_table,
|
||||
.probe = p54u_probe,
|
||||
.disconnect = __devexit_p(p54u_disconnect),
|
||||
.disconnect = p54u_disconnect,
|
||||
.pre_reset = p54u_pre_reset,
|
||||
.post_reset = p54u_post_reset,
|
||||
#ifdef CONFIG_PM
|
||||
|
|
Loading…
Reference in New Issue