提交 b4e54a94 编写于 作者: B Bill Pemberton 提交者: Greg Kroah-Hartman

8139too: 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: NBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 baf63293
...@@ -228,7 +228,7 @@ typedef enum { ...@@ -228,7 +228,7 @@ typedef enum {
static const struct { static const struct {
const char *name; const char *name;
u32 hw_flags; u32 hw_flags;
} board_info[] __devinitconst = { } board_info[] = {
{ "RealTek RTL8139", RTL8139_CAPS }, { "RealTek RTL8139", RTL8139_CAPS },
{ "RealTek RTL8129", RTL8129_CAPS }, { "RealTek RTL8129", RTL8129_CAPS },
}; };
...@@ -748,7 +748,7 @@ static void rtl8139_chip_reset (void __iomem *ioaddr) ...@@ -748,7 +748,7 @@ static void rtl8139_chip_reset (void __iomem *ioaddr)
} }
static __devinit struct net_device * rtl8139_init_board (struct pci_dev *pdev) static struct net_device *rtl8139_init_board(struct pci_dev *pdev)
{ {
struct device *d = &pdev->dev; struct device *d = &pdev->dev;
void __iomem *ioaddr; void __iomem *ioaddr;
...@@ -935,8 +935,8 @@ static const struct net_device_ops rtl8139_netdev_ops = { ...@@ -935,8 +935,8 @@ static const struct net_device_ops rtl8139_netdev_ops = {
.ndo_set_features = rtl8139_set_features, .ndo_set_features = rtl8139_set_features,
}; };
static int __devinit rtl8139_init_one (struct pci_dev *pdev, static int rtl8139_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct net_device *dev = NULL; struct net_device *dev = NULL;
struct rtl8139_private *tp; struct rtl8139_private *tp;
...@@ -1103,7 +1103,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev, ...@@ -1103,7 +1103,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
} }
static void __devexit rtl8139_remove_one (struct pci_dev *pdev) static void rtl8139_remove_one(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata (pdev); struct net_device *dev = pci_get_drvdata (pdev);
struct rtl8139_private *tp = netdev_priv(dev); struct rtl8139_private *tp = netdev_priv(dev);
...@@ -1141,7 +1141,7 @@ static void __devexit rtl8139_remove_one (struct pci_dev *pdev) ...@@ -1141,7 +1141,7 @@ static void __devexit rtl8139_remove_one (struct pci_dev *pdev)
#define EE_READ_CMD (6) #define EE_READ_CMD (6)
#define EE_ERASE_CMD (7) #define EE_ERASE_CMD (7)
static int __devinit read_eeprom (void __iomem *ioaddr, int location, int addr_len) static int read_eeprom(void __iomem *ioaddr, int location, int addr_len)
{ {
int i; int i;
unsigned retval = 0; unsigned retval = 0;
...@@ -2652,7 +2652,7 @@ static struct pci_driver rtl8139_pci_driver = { ...@@ -2652,7 +2652,7 @@ static struct pci_driver rtl8139_pci_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.id_table = rtl8139_pci_tbl, .id_table = rtl8139_pci_tbl,
.probe = rtl8139_init_one, .probe = rtl8139_init_one,
.remove = __devexit_p(rtl8139_remove_one), .remove = rtl8139_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = rtl8139_suspend, .suspend = rtl8139_suspend,
.resume = rtl8139_resume, .resume = rtl8139_resume,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册