leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tulip: remove __dev* attributes

Browse Source 
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: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bill Pemberton 2012-12-03 09:23:41 -05:00 committed by Greg Kroah-Hartman
parent f3f9e50927
commit 779c1a8581
9 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/ethernet/dec/tulip/de2104x.c
View File

@ -1700,7 +1700,7 @@ static const struct ethtool_ops de_ethtool_ops = {
.get_regs = de_get_regs, .get_regs = de_get_regs,
}; };
static void __devinit de21040_get_mac_address (struct de_private *de) static void de21040_get_mac_address(struct de_private *de)
{ {
unsigned i; unsigned i;
@ -1721,7 +1721,7 @@ static void __devinit de21040_get_mac_address (struct de_private *de)
} }
} }
static void __devinit de21040_get_media_info(struct de_private *de) static void de21040_get_media_info(struct de_private *de)
{ {
unsigned int i; unsigned int i;
@ -1748,7 +1748,8 @@ static void __devinit de21040_get_media_info(struct de_private *de)
} }
/* Note: this routine returns extra data bits for size detection. */ /* Note: this routine returns extra data bits for size detection. */
static unsigned __devinit tulip_read_eeprom(void __iomem *regs, int location, int addr_len) static unsigned tulip_read_eeprom(void __iomem *regs, int location,
int addr_len)
{ {
int i; int i;
unsigned retval = 0; unsigned retval = 0;
@ -1783,7 +1784,7 @@ static unsigned __devinit tulip_read_eeprom(void __iomem *regs, int location, in
return retval; return retval;
} }
static void __devinit de21041_get_srom_info (struct de_private *de) static void de21041_get_srom_info(struct de_private *de)
{ {
unsigned i, sa_offset = 0, ofs; unsigned i, sa_offset = 0, ofs;
u8 ee_data[DE_EEPROM_SIZE + 6] = {}; u8 ee_data[DE_EEPROM_SIZE + 6] = {};
@ -1961,7 +1962,7 @@ static const struct net_device_ops de_netdev_ops = {
.ndo_validate_addr = eth_validate_addr, .ndo_validate_addr = eth_validate_addr,
}; };
static int __devinit de_init_one (struct pci_dev *pdev, static int de_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct net_device *dev; struct net_device *dev;
@ -2099,7 +2100,7 @@ err_out_free:
return rc; return rc;
} }
static void __devexit de_remove_one (struct pci_dev *pdev) static void de_remove_one(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
struct de_private *de = netdev_priv(dev); struct de_private *de = netdev_priv(dev);
@ -2184,7 +2185,7 @@ static struct pci_driver de_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.id_table = de_pci_tbl, .id_table = de_pci_tbl,
.probe = de_init_one, .probe = de_init_one,
.remove = __devexit_p(de_remove_one), .remove = de_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = de_suspend, .suspend = de_suspend,
.resume = de_resume, .resume = de_resume,

16
drivers/net/ethernet/dec/tulip/de4x5.c
View File

@ -479,7 +479,7 @@
#include "de4x5.h" #include "de4x5.h"
static const char version[] __devinitconst = static const char version[] =
KERN_INFO "de4x5.c:V0.546 2001/02/22 davies@maniac.ultranet.com\n"; KERN_INFO "de4x5.c:V0.546 2001/02/22 davies@maniac.ultranet.com\n";
#define c_char const char #define c_char const char
@ -1092,7 +1092,7 @@ static const struct net_device_ops de4x5_netdev_ops = {
}; };
static int __devinit static int
de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev) de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
{ {
char name[DE4X5_NAME_LENGTH + 1]; char name[DE4X5_NAME_LENGTH + 1];
@ -2077,7 +2077,7 @@ static int __init de4x5_eisa_probe (struct device *gendev)
return status; return status;
} }
static int __devexit de4x5_eisa_remove (struct device *device) static int de4x5_eisa_remove(struct device *device)
{ {
struct net_device *dev; struct net_device *dev;
u_long iobase; u_long iobase;
@ -2104,7 +2104,7 @@ static struct eisa_driver de4x5_eisa_driver = {
.driver = { .driver = {
.name = "de4x5", .name = "de4x5",
.probe = de4x5_eisa_probe, .probe = de4x5_eisa_probe,
.remove = __devexit_p (de4x5_eisa_remove), .remove = de4x5_eisa_remove,
} }
}; };
MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids); MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);
@ -2118,7 +2118,7 @@ MODULE_DEVICE_TABLE(eisa, de4x5_eisa_ids);
** DECchips, we can find the base SROM irrespective of the BIOS scan direction. ** DECchips, we can find the base SROM irrespective of the BIOS scan direction.
** For single port cards this is a time waster... ** For single port cards this is a time waster...
*/ */
static void __devinit static void
srom_search(struct net_device *dev, struct pci_dev *pdev) srom_search(struct net_device *dev, struct pci_dev *pdev)
{ {
u_char pb; u_char pb;
@ -2192,7 +2192,7 @@ srom_search(struct net_device *dev, struct pci_dev *pdev)
** kernels use the V0.535[n] drivers. ** kernels use the V0.535[n] drivers.
*/ */
static int __devinit de4x5_pci_probe (struct pci_dev *pdev, static int de4x5_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
u_char pb, pbus = 0, dev_num, dnum = 0, timer; u_char pb, pbus = 0, dev_num, dnum = 0, timer;
@ -2314,7 +2314,7 @@ static int __devinit de4x5_pci_probe (struct pci_dev *pdev,
return error; return error;
} }
static void __devexit de4x5_pci_remove (struct pci_dev *pdev) static void de4x5_pci_remove(struct pci_dev *pdev)
{ {
struct net_device *dev; struct net_device *dev;
u_long iobase; u_long iobase;
@ -2344,7 +2344,7 @@ static struct pci_driver de4x5_pci_driver = {
.name = "de4x5", .name = "de4x5",
.id_table = de4x5_pci_tbl, .id_table = de4x5_pci_tbl,
.probe = de4x5_pci_probe, .probe = de4x5_pci_probe,
.remove = __devexit_p (de4x5_pci_remove), .remove = de4x5_pci_remove,
}; };
#endif #endif

10
drivers/net/ethernet/dec/tulip/dmfe.c
View File

@ -291,8 +291,8 @@ enum dmfe_CR6_bits {
}; };
/* Global variable declaration ----------------------------- */ /* Global variable declaration ----------------------------- */
static int __devinitdata printed_version; static int printed_version;
static const char version[] __devinitconst = static const char version[] =
"Davicom DM9xxx net driver, version " DRV_VERSION " (" DRV_RELDATE ")"; "Davicom DM9xxx net driver, version " DRV_VERSION " (" DRV_RELDATE ")";
static int dmfe_debug; static int dmfe_debug;
@ -367,7 +367,7 @@ static const struct net_device_ops netdev_ops = {
* Search DM910X board ,allocate space and register it * Search DM910X board ,allocate space and register it
*/ */
static int __devinit dmfe_init_one (struct pci_dev *pdev, static int dmfe_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct dmfe_board_info *db; /* board information structure */ struct dmfe_board_info *db; /* board information structure */
@ -531,7 +531,7 @@ err_out_free:
} }
static void __devexit dmfe_remove_one (struct pci_dev *pdev) static void dmfe_remove_one(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
struct dmfe_board_info *db = netdev_priv(dev); struct dmfe_board_info *db = netdev_priv(dev);
@ -2187,7 +2187,7 @@ static struct pci_driver dmfe_driver = {
.name = "dmfe", .name = "dmfe",
.id_table = dmfe_pci_tbl, .id_table = dmfe_pci_tbl,
.probe = dmfe_init_one, .probe = dmfe_init_one,
.remove = __devexit_p(dmfe_remove_one), .remove = dmfe_remove_one,
.suspend = dmfe_suspend, .suspend = dmfe_suspend,
.resume = dmfe_resume .resume = dmfe_resume
}; };

10
drivers/net/ethernet/dec/tulip/eeprom.c
View File

@ -26,7 +26,7 @@
*/ */
/* Known cards that have old-style EEPROMs. */ /* Known cards that have old-style EEPROMs. */
static struct eeprom_fixup eeprom_fixups[] __devinitdata = { static struct eeprom_fixup eeprom_fixups[] = {
{"Asante", 0, 0, 0x94, {0x1e00, 0x0000, 0x0800, 0x0100, 0x018c, {"Asante", 0, 0, 0x94, {0x1e00, 0x0000, 0x0800, 0x0100, 0x018c,
0x0000, 0x0000, 0xe078, 0x0001, 0x0050, 0x0018 }}, 0x0000, 0x0000, 0xe078, 0x0001, 0x0050, 0x0018 }},
{"SMC9332DST", 0, 0, 0xC0, { 0x1e00, 0x0000, 0x0800, 0x041f, {"SMC9332DST", 0, 0, 0xC0, { 0x1e00, 0x0000, 0x0800, 0x041f,
@ -79,7 +79,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = {
{NULL}}; {NULL}};
static const char *const block_name[] __devinitconst = { static const char *const block_name[] = {
"21140 non-MII", "21140 non-MII",
"21140 MII PHY", "21140 MII PHY",
"21142 Serial PHY", "21142 Serial PHY",
@ -102,7 +102,7 @@ static const char *const block_name[] __devinitconst = {
* #ifdef __hppa__ should completely optimize this function away for * #ifdef __hppa__ should completely optimize this function away for
* non-parisc hardware. * non-parisc hardware.
*/ */
static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp) static void tulip_build_fake_mediatable(struct tulip_private *tp)
{ {
#ifdef CONFIG_GSC #ifdef CONFIG_GSC
if (tp->flags & NEEDS_FAKE_MEDIA_TABLE) { if (tp->flags & NEEDS_FAKE_MEDIA_TABLE) {
@ -140,7 +140,7 @@ static void __devinit tulip_build_fake_mediatable(struct tulip_private *tp)
#endif #endif
} }
void __devinit tulip_parse_eeprom(struct net_device *dev) void tulip_parse_eeprom(struct net_device *dev)
{ {
/* /*
dev is not registered at this point, so logging messages can't dev is not registered at this point, so logging messages can't
@ -339,7 +339,7 @@ subsequent_board:
#define EE_READ_CMD (6) #define EE_READ_CMD (6)
/* Note: this routine returns extra data bits for size detection. */ /* Note: this routine returns extra data bits for size detection. */
int __devinit tulip_read_eeprom(struct net_device *dev, int location, int addr_len) int tulip_read_eeprom(struct net_device *dev, int location, int addr_len)
{ {
int i; int i;
unsigned retval = 0; unsigned retval = 0;

2
drivers/net/ethernet/dec/tulip/media.c
View File

@ -447,7 +447,7 @@ int tulip_check_duplex(struct net_device *dev)
return 0; return 0;
} }
void __devinit tulip_find_mii (struct net_device *dev, int board_idx) void tulip_find_mii(struct net_device *dev, int board_idx)
{ {
struct tulip_private *tp = netdev_priv(dev); struct tulip_private *tp = netdev_priv(dev);
int phyn, phy_idx = 0; int phyn, phy_idx = 0;

10
drivers/net/ethernet/dec/tulip/tulip_core.c
View File

@ -37,7 +37,7 @@
#include <asm/prom.h> #include <asm/prom.h>
#endif #endif
static char version[] __devinitdata = static char version[] =
"Linux Tulip driver version " DRV_VERSION " (" DRV_RELDATE ")\n"; "Linux Tulip driver version " DRV_VERSION " (" DRV_RELDATE ")\n";
/* A few user-configurable values. */ /* A few user-configurable values. */
@ -1191,7 +1191,7 @@ static void set_rx_mode(struct net_device *dev)
} }
#ifdef CONFIG_TULIP_MWI #ifdef CONFIG_TULIP_MWI
static void __devinit tulip_mwi_config (struct pci_dev *pdev, static void tulip_mwi_config(struct pci_dev *pdev,
struct net_device *dev) struct net_device *dev)
{ {
struct tulip_private *tp = netdev_priv(dev); struct tulip_private *tp = netdev_priv(dev);
@ -1301,7 +1301,7 @@ DEFINE_PCI_DEVICE_TABLE(early_486_chipsets) = {
{ }, { },
}; };
static int __devinit tulip_init_one (struct pci_dev *pdev, static int tulip_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct tulip_private *tp; struct tulip_private *tp;
@ -1927,7 +1927,7 @@ static int tulip_resume(struct pci_dev *pdev)
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
static void __devexit tulip_remove_one (struct pci_dev *pdev) static void tulip_remove_one(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata (pdev); struct net_device *dev = pci_get_drvdata (pdev);
struct tulip_private *tp; struct tulip_private *tp;
@ -1974,7 +1974,7 @@ static struct pci_driver tulip_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.id_table = tulip_pci_tbl, .id_table = tulip_pci_tbl,
.probe = tulip_init_one, .probe = tulip_init_one,
.remove = __devexit_p(tulip_remove_one), .remove = tulip_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = tulip_suspend, .suspend = tulip_suspend,
.resume = tulip_resume, .resume = tulip_resume,

10
drivers/net/ethernet/dec/tulip/uli526x.c
View File

@ -204,8 +204,8 @@ enum uli526x_CR6_bits {
}; };
/* Global variable declaration ----------------------------- */ /* Global variable declaration ----------------------------- */
static int __devinitdata printed_version; static int printed_version;
static const char version[] __devinitconst = static const char version[] =
"ULi M5261/M5263 net driver, version " DRV_VERSION " (" DRV_RELDATE ")"; "ULi M5261/M5263 net driver, version " DRV_VERSION " (" DRV_RELDATE ")";
static int uli526x_debug; static int uli526x_debug;
@ -281,7 +281,7 @@ static const struct net_device_ops netdev_ops = {
* Search ULI526X board, allocate space and register it * Search ULI526X board, allocate space and register it
*/ */
static int __devinit uli526x_init_one (struct pci_dev *pdev, static int uli526x_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct uli526x_board_info *db; /* board information structure */ struct uli526x_board_info *db; /* board information structure */
@ -436,7 +436,7 @@ err_out_free:
} }
static void __devexit uli526x_remove_one (struct pci_dev *pdev) static void uli526x_remove_one(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
struct uli526x_board_info *db = netdev_priv(dev); struct uli526x_board_info *db = netdev_priv(dev);
@ -1788,7 +1788,7 @@ static struct pci_driver uli526x_driver = {
.name = "uli526x", .name = "uli526x",
.id_table = uli526x_pci_tbl, .id_table = uli526x_pci_tbl,
.probe = uli526x_init_one, .probe = uli526x_init_one,
.remove = __devexit_p(uli526x_remove_one), .remove = uli526x_remove_one,
.suspend = uli526x_suspend, .suspend = uli526x_suspend,
.resume = uli526x_resume, .resume = uli526x_resume,
}; };

8
drivers/net/ethernet/dec/tulip/winbond-840.c
View File

@ -236,7 +236,7 @@ struct pci_id_info {
int drv_flags; /* Driver use, intended as capability flags. */ int drv_flags; /* Driver use, intended as capability flags. */
}; };
static const struct pci_id_info pci_id_tbl[] __devinitconst = { static const struct pci_id_info pci_id_tbl[] = {
{ /* Sometime a Level-One switch card. */ { /* Sometime a Level-One switch card. */
"Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII}, "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII},
{ "Winbond W89c840", CanHaveMII | HasBrokenTx}, { "Winbond W89c840", CanHaveMII | HasBrokenTx},
@ -358,7 +358,7 @@ static const struct net_device_ops netdev_ops = {
.ndo_validate_addr = eth_validate_addr, .ndo_validate_addr = eth_validate_addr,
}; };
static int __devinit w840_probe1 (struct pci_dev *pdev, static int w840_probe1(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct net_device *dev; struct net_device *dev;
@ -1532,7 +1532,7 @@ static int netdev_close(struct net_device *dev)
return 0; return 0;
} }
static void __devexit w840_remove1 (struct pci_dev *pdev) static void w840_remove1(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
@ -1647,7 +1647,7 @@ static struct pci_driver w840_driver = {
.name = DRV_NAME, .name = DRV_NAME,
.id_table = w840_pci_tbl, .id_table = w840_pci_tbl,
.probe = w840_probe1, .probe = w840_probe1,
.remove = __devexit_p(w840_remove1), .remove = w840_remove1,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = w840_suspend, .suspend = w840_suspend,
.resume = w840_resume, .resume = w840_resume,

6
drivers/net/ethernet/dec/tulip/xircom_cb.c
View File

@ -148,7 +148,7 @@ static struct pci_driver xircom_ops = {
.name = "xircom_cb", .name = "xircom_cb",
.id_table = xircom_pci_table, .id_table = xircom_pci_table,
.probe = xircom_probe, .probe = xircom_probe,
.remove = __devexit_p(xircom_remove), .remove = xircom_remove,
}; };
@ -190,7 +190,7 @@ static const struct net_device_ops netdev_ops = {
first two packets that get send, and pump hates that. first two packets that get send, and pump hates that.
*/ */
static int __devinit xircom_probe(struct pci_dev *pdev, const struct pci_device_id *id) static int xircom_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{ {
struct device *d = &pdev->dev; struct device *d = &pdev->dev;
struct net_device *dev = NULL; struct net_device *dev = NULL;
@ -312,7 +312,7 @@ err_disable:
Interrupts and such are already stopped in the "ifconfig ethX down" Interrupts and such are already stopped in the "ifconfig ethX down"
code. code.
*/ */
static void __devexit xircom_remove(struct pci_dev *pdev) static void xircom_remove(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
struct xircom_private *card = netdev_priv(dev); struct xircom_private *card = netdev_priv(dev);