Skip to content

L
linux
Commit f73d12bd authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files
Options

net/sun: 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 avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f48a3c2a
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 80 deletions
drivers/net/ethernet/sun/cassini.c
View file @ f73d12bd
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
#define CAS_RESET_SPARE 3 #define CAS_RESET_SPARE 3
#endif #endif
static char version[] __devinitdata = static char version[] =
DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
static int cassini_debug = -1; /* -1 == use CAS_DEF_MSG_ENABLE as value */ static int cassini_debug = -1; /* -1 == use CAS_DEF_MSG_ENABLE as value */
...@@ -222,7 +222,7 @@ static int link_transition_timeout; ...@@ -222,7 +222,7 @@ static int link_transition_timeout;
static u16 link_modes[] __devinitdata = { static u16 link_modes[] = {
BMCR_ANENABLE, /* 0 : autoneg */ BMCR_ANENABLE, /* 0 : autoneg */
0, /* 1 : 10bt half duplex */ 0, /* 1 : 10bt half duplex */
BMCR_SPEED100, /* 2 : 100bt half duplex */ BMCR_SPEED100, /* 2 : 100bt half duplex */
...@@ -4820,7 +4820,7 @@ static int cas_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -4820,7 +4820,7 @@ static int cas_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
* only subordinate device and we can tweak the bridge settings to * only subordinate device and we can tweak the bridge settings to
* reflect that fact. * reflect that fact.
*/ */
static void __devinit cas_program_bridge(struct pci_dev *cas_pdev) static void cas_program_bridge(struct pci_dev *cas_pdev)
{ {
struct pci_dev *pdev = cas_pdev->bus->self; struct pci_dev *pdev = cas_pdev->bus->self;
u32 val; u32 val;
...@@ -4916,7 +4916,7 @@ static const struct net_device_ops cas_netdev_ops = { ...@@ -4916,7 +4916,7 @@ static const struct net_device_ops cas_netdev_ops = {
#endif #endif
}; };
static int __devinit cas_init_one(struct pci_dev *pdev, static int cas_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
static int cas_version_printed = 0; static int cas_version_printed = 0;
...@@ -5175,7 +5175,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev, ...@@ -5175,7 +5175,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
return -ENODEV; return -ENODEV;
} }
static void __devexit cas_remove_one(struct pci_dev *pdev) static void cas_remove_one(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
struct cas *cp; struct cas *cp;
...@@ -5273,7 +5273,7 @@ static struct pci_driver cas_driver = { ...@@ -5273,7 +5273,7 @@ static struct pci_driver cas_driver = {
.name = DRV_MODULE_NAME, .name = DRV_MODULE_NAME,
.id_table = cas_pci_tbl, .id_table = cas_pci_tbl,
.probe = cas_init_one, .probe = cas_init_one,
.remove = __devexit_p(cas_remove_one), .remove = cas_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = cas_suspend, .suspend = cas_suspend,
.resume = cas_resume .resume = cas_resume
......
drivers/net/ethernet/sun/niu.c
View file @ f73d12bd
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#define DRV_MODULE_VERSION "1.1" #define DRV_MODULE_VERSION "1.1"
#define DRV_MODULE_RELDATE "Apr 22, 2010" #define DRV_MODULE_RELDATE "Apr 22, 2010"
static char version[] __devinitdata = static char version[] =
DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
MODULE_AUTHOR("David S. Miller (davem@davemloft.net)"); MODULE_AUTHOR("David S. Miller (davem@davemloft.net)");
...@@ -7977,7 +7977,7 @@ static int niu_set_ldg_sid(struct niu *np, int ldg, int func, int vector) ...@@ -7977,7 +7977,7 @@ static int niu_set_ldg_sid(struct niu *np, int ldg, int func, int vector)
return 0; return 0;
} }
static int __devinit niu_pci_eeprom_read(struct niu *np, u32 addr) static int niu_pci_eeprom_read(struct niu *np, u32 addr)
{ {
u64 frame, frame_base = (ESPC_PIO_STAT_READ_START | u64 frame, frame_base = (ESPC_PIO_STAT_READ_START |
(addr << ESPC_PIO_STAT_ADDR_SHIFT)); (addr << ESPC_PIO_STAT_ADDR_SHIFT));
...@@ -8020,7 +8020,7 @@ static int __devinit niu_pci_eeprom_read(struct niu *np, u32 addr) ...@@ -8020,7 +8020,7 @@ static int __devinit niu_pci_eeprom_read(struct niu *np, u32 addr)
return (frame & ESPC_PIO_STAT_DATA) >> ESPC_PIO_STAT_DATA_SHIFT; return (frame & ESPC_PIO_STAT_DATA) >> ESPC_PIO_STAT_DATA_SHIFT;
} }
static int __devinit niu_pci_eeprom_read16(struct niu *np, u32 off) static int niu_pci_eeprom_read16(struct niu *np, u32 off)
{ {
int err = niu_pci_eeprom_read(np, off); int err = niu_pci_eeprom_read(np, off);
u16 val; u16 val;
...@@ -8036,7 +8036,7 @@ static int __devinit niu_pci_eeprom_read16(struct niu *np, u32 off) ...@@ -8036,7 +8036,7 @@ static int __devinit niu_pci_eeprom_read16(struct niu *np, u32 off)
return val; return val;
} }
static int __devinit niu_pci_eeprom_read16_swp(struct niu *np, u32 off) static int niu_pci_eeprom_read16_swp(struct niu *np, u32 off)
{ {
int err = niu_pci_eeprom_read(np, off); int err = niu_pci_eeprom_read(np, off);
u16 val; u16 val;
...@@ -8054,7 +8054,7 @@ static int __devinit niu_pci_eeprom_read16_swp(struct niu *np, u32 off) ...@@ -8054,7 +8054,7 @@ static int __devinit niu_pci_eeprom_read16_swp(struct niu *np, u32 off)
return val; return val;
} }
static int __devinit niu_pci_vpd_get_propname(struct niu *np, static int niu_pci_vpd_get_propname(struct niu *np,
u32 off, u32 off,
char *namebuf, char *namebuf,
int namebuf_len) int namebuf_len)
...@@ -8075,7 +8075,7 @@ static int __devinit niu_pci_vpd_get_propname(struct niu *np, ...@@ -8075,7 +8075,7 @@ static int __devinit niu_pci_vpd_get_propname(struct niu *np,
return i + 1; return i + 1;
} }
static void __devinit niu_vpd_parse_version(struct niu *np) static void niu_vpd_parse_version(struct niu *np)
{ {
struct niu_vpd *vpd = &np->vpd; struct niu_vpd *vpd = &np->vpd;
int len = strlen(vpd->version) + 1; int len = strlen(vpd->version) + 1;
...@@ -8102,7 +8102,7 @@ static void __devinit niu_vpd_parse_version(struct niu *np) ...@@ -8102,7 +8102,7 @@ static void __devinit niu_vpd_parse_version(struct niu *np)
} }
/* ESPC_PIO_EN_ENABLE must be set */ /* ESPC_PIO_EN_ENABLE must be set */
static int __devinit niu_pci_vpd_scan_props(struct niu *np, static int niu_pci_vpd_scan_props(struct niu *np,
u32 start, u32 end) u32 start, u32 end)
{ {
unsigned int found_mask = 0; unsigned int found_mask = 0;
...@@ -8189,7 +8189,7 @@ static int __devinit niu_pci_vpd_scan_props(struct niu *np, ...@@ -8189,7 +8189,7 @@ static int __devinit niu_pci_vpd_scan_props(struct niu *np,
} }
/* ESPC_PIO_EN_ENABLE must be set */ /* ESPC_PIO_EN_ENABLE must be set */
static void __devinit niu_pci_vpd_fetch(struct niu *np, u32 start) static void niu_pci_vpd_fetch(struct niu *np, u32 start)
{ {
u32 offset; u32 offset;
int err; int err;
...@@ -8224,7 +8224,7 @@ static void __devinit niu_pci_vpd_fetch(struct niu *np, u32 start) ...@@ -8224,7 +8224,7 @@ static void __devinit niu_pci_vpd_fetch(struct niu *np, u32 start)
} }
/* ESPC_PIO_EN_ENABLE must be set */ /* ESPC_PIO_EN_ENABLE must be set */
static u32 __devinit niu_pci_vpd_offset(struct niu *np) static u32 niu_pci_vpd_offset(struct niu *np)
{ {
u32 start = 0, end = ESPC_EEPROM_SIZE, ret; u32 start = 0, end = ESPC_EEPROM_SIZE, ret;
int err; int err;
...@@ -8279,7 +8279,7 @@ static u32 __devinit niu_pci_vpd_offset(struct niu *np) ...@@ -8279,7 +8279,7 @@ static u32 __devinit niu_pci_vpd_offset(struct niu *np)
return 0; return 0;
} }
static int __devinit niu_phy_type_prop_decode(struct niu *np, static int niu_phy_type_prop_decode(struct niu *np,
const char *phy_prop) const char *phy_prop)
{ {
if (!strcmp(phy_prop, "mif")) { if (!strcmp(phy_prop, "mif")) {
...@@ -8334,7 +8334,7 @@ static int niu_pci_vpd_get_nports(struct niu *np) ...@@ -8334,7 +8334,7 @@ static int niu_pci_vpd_get_nports(struct niu *np)
return ports; return ports;
} }
static void __devinit niu_pci_vpd_validate(struct niu *np) static void niu_pci_vpd_validate(struct niu *np)
{ {
struct net_device *dev = np->dev; struct net_device *dev = np->dev;
struct niu_vpd *vpd = &np->vpd; struct niu_vpd *vpd = &np->vpd;
...@@ -8380,7 +8380,7 @@ static void __devinit niu_pci_vpd_validate(struct niu *np) ...@@ -8380,7 +8380,7 @@ static void __devinit niu_pci_vpd_validate(struct niu *np)
memcpy(dev->dev_addr, dev->perm_addr, dev->addr_len); memcpy(dev->dev_addr, dev->perm_addr, dev->addr_len);
} }
static int __devinit niu_pci_probe_sprom(struct niu *np) static int niu_pci_probe_sprom(struct niu *np)
{ {
struct net_device *dev = np->dev; struct net_device *dev = np->dev;
int len, i; int len, i;
...@@ -8538,7 +8538,7 @@ static int __devinit niu_pci_probe_sprom(struct niu *np) ...@@ -8538,7 +8538,7 @@ static int __devinit niu_pci_probe_sprom(struct niu *np)
return 0; return 0;
} }
static int __devinit niu_get_and_validate_port(struct niu *np) static int niu_get_and_validate_port(struct niu *np)
{ {
struct niu_parent *parent = np->parent; struct niu_parent *parent = np->parent;
...@@ -8572,7 +8572,7 @@ static int __devinit niu_get_and_validate_port(struct niu *np) ...@@ -8572,7 +8572,7 @@ static int __devinit niu_get_and_validate_port(struct niu *np)
return 0; return 0;
} }
static int __devinit phy_record(struct niu_parent *parent, static int phy_record(struct niu_parent *parent,
struct phy_probe_info *p, struct phy_probe_info *p,
int dev_id_1, int dev_id_2, u8 phy_port, int dev_id_1, int dev_id_2, u8 phy_port,
int type) int type)
...@@ -8611,7 +8611,7 @@ static int __devinit phy_record(struct niu_parent *parent, ...@@ -8611,7 +8611,7 @@ static int __devinit phy_record(struct niu_parent *parent,
return 0; return 0;
} }
static int __devinit port_has_10g(struct phy_probe_info *p, int port) static int port_has_10g(struct phy_probe_info *p, int port)
{ {
int i; int i;
...@@ -8627,7 +8627,7 @@ static int __devinit port_has_10g(struct phy_probe_info *p, int port) ...@@ -8627,7 +8627,7 @@ static int __devinit port_has_10g(struct phy_probe_info *p, int port)
return 0; return 0;
} }
static int __devinit count_10g_ports(struct phy_probe_info *p, int *lowest) static int count_10g_ports(struct phy_probe_info *p, int *lowest)
{ {
int port, cnt; int port, cnt;
...@@ -8644,7 +8644,7 @@ static int __devinit count_10g_ports(struct phy_probe_info *p, int *lowest) ...@@ -8644,7 +8644,7 @@ static int __devinit count_10g_ports(struct phy_probe_info *p, int *lowest)
return cnt; return cnt;
} }
static int __devinit count_1g_ports(struct phy_probe_info *p, int *lowest) static int count_1g_ports(struct phy_probe_info *p, int *lowest)
{ {
*lowest = 32; *lowest = 32;
if (p->cur[PHY_TYPE_MII]) if (p->cur[PHY_TYPE_MII])
...@@ -8653,7 +8653,7 @@ static int __devinit count_1g_ports(struct phy_probe_info *p, int *lowest) ...@@ -8653,7 +8653,7 @@ static int __devinit count_1g_ports(struct phy_probe_info *p, int *lowest)
return p->cur[PHY_TYPE_MII]; return p->cur[PHY_TYPE_MII];
} }
static void __devinit niu_n2_divide_channels(struct niu_parent *parent) static void niu_n2_divide_channels(struct niu_parent *parent)
{ {
int num_ports = parent->num_ports; int num_ports = parent->num_ports;
int i; int i;
...@@ -8669,7 +8669,7 @@ static void __devinit niu_n2_divide_channels(struct niu_parent *parent) ...@@ -8669,7 +8669,7 @@ static void __devinit niu_n2_divide_channels(struct niu_parent *parent)
} }
} }
static void __devinit niu_divide_channels(struct niu_parent *parent, static void niu_divide_channels(struct niu_parent *parent,
int num_10g, int num_1g) int num_10g, int num_1g)
{ {
int num_ports = parent->num_ports; int num_ports = parent->num_ports;
...@@ -8731,7 +8731,7 @@ static void __devinit niu_divide_channels(struct niu_parent *parent, ...@@ -8731,7 +8731,7 @@ static void __devinit niu_divide_channels(struct niu_parent *parent,
} }
} }
static void __devinit niu_divide_rdc_groups(struct niu_parent *parent, static void niu_divide_rdc_groups(struct niu_parent *parent,
int num_10g, int num_1g) int num_10g, int num_1g)
{ {
int i, num_ports = parent->num_ports; int i, num_ports = parent->num_ports;
...@@ -8776,7 +8776,7 @@ static void __devinit niu_divide_rdc_groups(struct niu_parent *parent, ...@@ -8776,7 +8776,7 @@ static void __devinit niu_divide_rdc_groups(struct niu_parent *parent,
} }
} }
static int __devinit fill_phy_probe_info(struct niu *np, static int fill_phy_probe_info(struct niu *np,
struct niu_parent *parent, struct niu_parent *parent,
struct phy_probe_info *info) struct phy_probe_info *info)
{ {
...@@ -8819,7 +8819,7 @@ static int __devinit fill_phy_probe_info(struct niu *np, ...@@ -8819,7 +8819,7 @@ static int __devinit fill_phy_probe_info(struct niu *np,
return err; return err;
} }
static int __devinit walk_phys(struct niu *np, struct niu_parent *parent) static int walk_phys(struct niu *np, struct niu_parent *parent)
{ {
struct phy_probe_info *info = &parent->phy_probe_info; struct phy_probe_info *info = &parent->phy_probe_info;
int lowest_10g, lowest_1g; int lowest_10g, lowest_1g;
...@@ -8948,7 +8948,7 @@ static int __devinit walk_phys(struct niu *np, struct niu_parent *parent) ...@@ -8948,7 +8948,7 @@ static int __devinit walk_phys(struct niu *np, struct niu_parent *parent)
return -EINVAL; return -EINVAL;
} }
static int __devinit niu_probe_ports(struct niu *np) static int niu_probe_ports(struct niu *np)
{ {
struct niu_parent *parent = np->parent; struct niu_parent *parent = np->parent;
int err, i; int err, i;
...@@ -8969,7 +8969,7 @@ static int __devinit niu_probe_ports(struct niu *np) ...@@ -8969,7 +8969,7 @@ static int __devinit niu_probe_ports(struct niu *np)
return 0; return 0;
} }
static int __devinit niu_classifier_swstate_init(struct niu *np) static int niu_classifier_swstate_init(struct niu *np)
{ {
struct niu_classifier *cp = &np->clas; struct niu_classifier *cp = &np->clas;
...@@ -8981,7 +8981,7 @@ static int __devinit niu_classifier_swstate_init(struct niu *np) ...@@ -8981,7 +8981,7 @@ static int __devinit niu_classifier_swstate_init(struct niu *np)
return fflp_early_init(np); return fflp_early_init(np);
} }
static void __devinit niu_link_config_init(struct niu *np) static void niu_link_config_init(struct niu *np)
{ {
struct niu_link_config *lp = &np->link_config; struct niu_link_config *lp = &np->link_config;
...@@ -9006,7 +9006,7 @@ static void __devinit niu_link_config_init(struct niu *np) ...@@ -9006,7 +9006,7 @@ static void __devinit niu_link_config_init(struct niu *np)
#endif #endif
} }
static int __devinit niu_init_mac_ipp_pcs_base(struct niu *np) static int niu_init_mac_ipp_pcs_base(struct niu *np)
{ {
switch (np->port) { switch (np->port) {
case 0: case 0:
...@@ -9045,7 +9045,7 @@ static int __devinit niu_init_mac_ipp_pcs_base(struct niu *np) ...@@ -9045,7 +9045,7 @@ static int __devinit niu_init_mac_ipp_pcs_base(struct niu *np)
return 0; return 0;
} }
static void __devinit niu_try_msix(struct niu *np, u8 *ldg_num_map) static void niu_try_msix(struct niu *np, u8 *ldg_num_map)
{ {
struct msix_entry msi_vec[NIU_NUM_LDG]; struct msix_entry msi_vec[NIU_NUM_LDG];
struct niu_parent *parent = np->parent; struct niu_parent *parent = np->parent;
...@@ -9084,7 +9084,7 @@ static void __devinit niu_try_msix(struct niu *np, u8 *ldg_num_map) ...@@ -9084,7 +9084,7 @@ static void __devinit niu_try_msix(struct niu *np, u8 *ldg_num_map)
np->num_ldg = num_irqs; np->num_ldg = num_irqs;
} }
static int __devinit niu_n2_irq_init(struct niu *np, u8 *ldg_num_map) static int niu_n2_irq_init(struct niu *np, u8 *ldg_num_map)
{ {
#ifdef CONFIG_SPARC64 #ifdef CONFIG_SPARC64
struct platform_device *op = np->op; struct platform_device *op = np->op;
...@@ -9108,7 +9108,7 @@ static int __devinit niu_n2_irq_init(struct niu *np, u8 *ldg_num_map) ...@@ -9108,7 +9108,7 @@ static int __devinit niu_n2_irq_init(struct niu *np, u8 *ldg_num_map)
#endif #endif
} }
static int __devinit niu_ldg_init(struct niu *np) static int niu_ldg_init(struct niu *np)
{ {
struct niu_parent *parent = np->parent; struct niu_parent *parent = np->parent;
u8 ldg_num_map[NIU_NUM_LDG]; u8 ldg_num_map[NIU_NUM_LDG];
...@@ -9225,13 +9225,13 @@ static int __devinit niu_ldg_init(struct niu *np) ...@@ -9225,13 +9225,13 @@ static int __devinit niu_ldg_init(struct niu *np)
return 0; return 0;
} }
static void __devexit niu_ldg_free(struct niu *np) static void niu_ldg_free(struct niu *np)
{ {
if (np->flags & NIU_FLAGS_MSIX) if (np->flags & NIU_FLAGS_MSIX)
pci_disable_msix(np->pdev); pci_disable_msix(np->pdev);
} }
static int __devinit niu_get_of_props(struct niu *np) static int niu_get_of_props(struct niu *np)
{ {
#ifdef CONFIG_SPARC64 #ifdef CONFIG_SPARC64
struct net_device *dev = np->dev; struct net_device *dev = np->dev;
...@@ -9300,7 +9300,7 @@ static int __devinit niu_get_of_props(struct niu *np) ...@@ -9300,7 +9300,7 @@ static int __devinit niu_get_of_props(struct niu *np)
#endif #endif
} }
static int __devinit niu_get_invariants(struct niu *np) static int niu_get_invariants(struct niu *np)
{ {
int err, have_props; int err, have_props;
u32 offset; u32 offset;
...@@ -9479,7 +9479,7 @@ static struct device_attribute niu_parent_attributes[] = { ...@@ -9479,7 +9479,7 @@ static struct device_attribute niu_parent_attributes[] = {
{} {}
}; };
static struct niu_parent * __devinit niu_new_parent(struct niu *np, static struct niu_parent *niu_new_parent(struct niu *np,
union niu_parent_id *id, union niu_parent_id *id,
u8 ptype) u8 ptype)
{ {
...@@ -9544,7 +9544,7 @@ static struct niu_parent * __devinit niu_new_parent(struct niu *np, ...@@ -9544,7 +9544,7 @@ static struct niu_parent * __devinit niu_new_parent(struct niu *np,
return NULL; return NULL;
} }
static struct niu_parent * __devinit niu_get_parent(struct niu *np, static struct niu_parent *niu_get_parent(struct niu *np,
union niu_parent_id *id, union niu_parent_id *id,
u8 ptype) u8 ptype)
{ {
...@@ -9662,7 +9662,7 @@ static const struct niu_ops niu_pci_ops = { ...@@ -9662,7 +9662,7 @@ static const struct niu_ops niu_pci_ops = {
.unmap_single = niu_pci_unmap_single, .unmap_single = niu_pci_unmap_single,
}; };
static void __devinit niu_driver_version(void) static void niu_driver_version(void)
{ {
static int niu_version_printed; static int niu_version_printed;
...@@ -9670,7 +9670,7 @@ static void __devinit niu_driver_version(void) ...@@ -9670,7 +9670,7 @@ static void __devinit niu_driver_version(void)
pr_info("%s", version); pr_info("%s", version);
} }
static struct net_device * __devinit niu_alloc_and_init( static struct net_device *niu_alloc_and_init(
struct device *gen_dev, struct pci_dev *pdev, struct device *gen_dev, struct pci_dev *pdev,
struct platform_device *op, const struct niu_ops *ops, struct platform_device *op, const struct niu_ops *ops,
u8 port) u8 port)
...@@ -9714,14 +9714,14 @@ static const struct net_device_ops niu_netdev_ops = { ...@@ -9714,14 +9714,14 @@ static const struct net_device_ops niu_netdev_ops = {
.ndo_change_mtu = niu_change_mtu, .ndo_change_mtu = niu_change_mtu,
}; };
static void __devinit niu_assign_netdev_ops(struct net_device *dev) static void niu_assign_netdev_ops(struct net_device *dev)
{ {
dev->netdev_ops = &niu_netdev_ops; dev->netdev_ops = &niu_netdev_ops;
dev->ethtool_ops = &niu_ethtool_ops; dev->ethtool_ops = &niu_ethtool_ops;
dev->watchdog_timeo = NIU_TX_TIMEOUT; dev->watchdog_timeo = NIU_TX_TIMEOUT;
} }
static void __devinit niu_device_announce(struct niu *np) static void niu_device_announce(struct niu *np)
{ {
struct net_device *dev = np->dev; struct net_device *dev = np->dev;
...@@ -9750,13 +9750,13 @@ static void __devinit niu_device_announce(struct niu *np) ...@@ -9750,13 +9750,13 @@ static void __devinit niu_device_announce(struct niu *np)
} }
} }
static void __devinit niu_set_basic_features(struct net_device *dev) static void niu_set_basic_features(struct net_device *dev)
{ {
dev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXHASH; dev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXHASH;
dev->features |= dev->hw_features | NETIF_F_RXCSUM; dev->features |= dev->hw_features | NETIF_F_RXCSUM;
} }
static int __devinit niu_pci_init_one(struct pci_dev *pdev, static int niu_pci_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
union niu_parent_id parent_id; union niu_parent_id parent_id;
...@@ -9895,7 +9895,7 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev, ...@@ -9895,7 +9895,7 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev,
return err; return err;
} }
static void __devexit niu_pci_remove_one(struct pci_dev *pdev) static void niu_pci_remove_one(struct pci_dev *pdev)
{ {
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
...@@ -9980,7 +9980,7 @@ static struct pci_driver niu_pci_driver = { ...@@ -9980,7 +9980,7 @@ static struct pci_driver niu_pci_driver = {
.name = DRV_MODULE_NAME, .name = DRV_MODULE_NAME,
.id_table = niu_pci_tbl, .id_table = niu_pci_tbl,
.probe = niu_pci_init_one, .probe = niu_pci_init_one,
.remove = __devexit_p(niu_pci_remove_one), .remove = niu_pci_remove_one,
.suspend = niu_suspend, .suspend = niu_suspend,
.resume = niu_resume, .resume = niu_resume,
}; };
...@@ -10044,7 +10044,7 @@ static const struct niu_ops niu_phys_ops = { ...@@ -10044,7 +10044,7 @@ static const struct niu_ops niu_phys_ops = {
.unmap_single = niu_phys_unmap_single, .unmap_single = niu_phys_unmap_single,
}; };
static int __devinit niu_of_probe(struct platform_device *op) static int niu_of_probe(struct platform_device *op)
{ {
union niu_parent_id parent_id; union niu_parent_id parent_id;
struct net_device *dev; struct net_device *dev;
...@@ -10158,7 +10158,7 @@ static int __devinit niu_of_probe(struct platform_device *op) ...@@ -10158,7 +10158,7 @@ static int __devinit niu_of_probe(struct platform_device *op)
return err; return err;
} }
static int __devexit niu_of_remove(struct platform_device *op) static int niu_of_remove(struct platform_device *op)
{ {
struct net_device *dev = dev_get_drvdata(&op->dev); struct net_device *dev = dev_get_drvdata(&op->dev);
...@@ -10211,7 +10211,7 @@ static struct platform_driver niu_of_driver = { ...@@ -10211,7 +10211,7 @@ static struct platform_driver niu_of_driver = {
.of_match_table = niu_match, .of_match_table = niu_match,
}, },
.probe = niu_of_probe, .probe = niu_of_probe,
.remove = __devexit_p(niu_of_remove), .remove = niu_of_remove,
}; };
#endif /* CONFIG_SPARC64 */ #endif /* CONFIG_SPARC64 */
......
drivers/net/ethernet/sun/sunbmac.c
View file @ f73d12bd
...@@ -1074,7 +1074,7 @@ static const struct net_device_ops bigmac_ops = { ...@@ -1074,7 +1074,7 @@ static const struct net_device_ops bigmac_ops = {
.ndo_validate_addr = eth_validate_addr, .ndo_validate_addr = eth_validate_addr,
}; };
static int __devinit bigmac_ether_init(struct platform_device *op, static int bigmac_ether_init(struct platform_device *op,
struct platform_device *qec_op) struct platform_device *qec_op)
{ {
static int version_printed; static int version_printed;
...@@ -1233,7 +1233,7 @@ static int __devinit bigmac_ether_init(struct platform_device *op, ...@@ -1233,7 +1233,7 @@ static int __devinit bigmac_ether_init(struct platform_device *op,
/* QEC can be the parent of either QuadEthernet or a BigMAC. We want /* QEC can be the parent of either QuadEthernet or a BigMAC. We want
* the latter. * the latter.
*/ */
static int __devinit bigmac_sbus_probe(struct platform_device *op) static int bigmac_sbus_probe(struct platform_device *op)
{ {
struct device *parent = op->dev.parent; struct device *parent = op->dev.parent;
struct platform_device *qec_op; struct platform_device *qec_op;
...@@ -1243,7 +1243,7 @@ static int __devinit bigmac_sbus_probe(struct platform_device *op) ...@@ -1243,7 +1243,7 @@ static int __devinit bigmac_sbus_probe(struct platform_device *op)
return bigmac_ether_init(op, qec_op); return bigmac_ether_init(op, qec_op);
} }
static int __devexit bigmac_sbus_remove(struct platform_device *op) static int bigmac_sbus_remove(struct platform_device *op)
{ {
struct bigmac *bp = dev_get_drvdata(&op->dev); struct bigmac *bp = dev_get_drvdata(&op->dev);
struct device *parent = op->dev.parent; struct device *parent = op->dev.parent;
...@@ -1286,7 +1286,7 @@ static struct platform_driver bigmac_sbus_driver = { ...@@ -1286,7 +1286,7 @@ static struct platform_driver bigmac_sbus_driver = {
.of_match_table = bigmac_sbus_match, .of_match_table = bigmac_sbus_match,
}, },
.probe = bigmac_sbus_probe, .probe = bigmac_sbus_probe,
.remove = __devexit_p(bigmac_sbus_remove), .remove = bigmac_sbus_remove,
}; };
module_platform_driver(bigmac_sbus_driver); module_platform_driver(bigmac_sbus_driver);
drivers/net/ethernet/sun/sungem.c
View file @ f73d12bd
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
#define DRV_VERSION "1.0" #define DRV_VERSION "1.0"
#define DRV_AUTHOR "David S. Miller <davem@redhat.com>" #define DRV_AUTHOR "David S. Miller <davem@redhat.com>"
static char version[] __devinitdata = static char version[] =
DRV_NAME ".c:v" DRV_VERSION " " DRV_AUTHOR "\n"; DRV_NAME ".c:v" DRV_VERSION " " DRV_AUTHOR "\n";
MODULE_AUTHOR(DRV_AUTHOR); MODULE_AUTHOR(DRV_AUTHOR);
...@@ -2763,7 +2763,7 @@ static void get_gem_mac_nonobp(struct pci_dev *pdev, unsigned char *dev_addr) ...@@ -2763,7 +2763,7 @@ static void get_gem_mac_nonobp(struct pci_dev *pdev, unsigned char *dev_addr)
} }
#endif /* not Sparc and not PPC */ #endif /* not Sparc and not PPC */
static int __devinit gem_get_device_address(struct gem *gp) static int gem_get_device_address(struct gem *gp)
{ {
#if defined(CONFIG_SPARC) || defined(CONFIG_PPC_PMAC) #if defined(CONFIG_SPARC) || defined(CONFIG_PPC_PMAC)
struct net_device *dev = gp->dev; struct net_device *dev = gp->dev;
...@@ -2827,7 +2827,7 @@ static const struct net_device_ops gem_netdev_ops = { ...@@ -2827,7 +2827,7 @@ static const struct net_device_ops gem_netdev_ops = {
#endif #endif
}; };
static int __devinit gem_init_one(struct pci_dev *pdev, static int gem_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
unsigned long gemreg_base, gemreg_len; unsigned long gemreg_base, gemreg_len;
......
drivers/net/ethernet/sun/sunhme.c
View file @ f73d12bd
...@@ -2499,7 +2499,7 @@ static int hme_version_printed; ...@@ -2499,7 +2499,7 @@ static int hme_version_printed;
* *
* Return NULL on failure. * Return NULL on failure.
*/ */
static struct quattro * __devinit quattro_sbus_find(struct platform_device *child) static struct quattro *quattro_sbus_find(struct platform_device *child)
{ {
struct device *parent = child->dev.parent; struct device *parent = child->dev.parent;
struct platform_device *op; struct platform_device *op;
...@@ -2580,7 +2580,7 @@ static void quattro_sbus_free_irqs(void) ...@@ -2580,7 +2580,7 @@ static void quattro_sbus_free_irqs(void)
#endif /* CONFIG_SBUS */ #endif /* CONFIG_SBUS */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
static struct quattro * __devinit quattro_pci_find(struct pci_dev *pdev) static struct quattro *quattro_pci_find(struct pci_dev *pdev)
{ {
struct pci_dev *bdev = pdev->bus->self; struct pci_dev *bdev = pdev->bus->self;
struct quattro *qp; struct quattro *qp;
...@@ -2623,7 +2623,7 @@ static const struct net_device_ops hme_netdev_ops = { ...@@ -2623,7 +2623,7 @@ static const struct net_device_ops hme_netdev_ops = {
}; };
#ifdef CONFIG_SBUS #ifdef CONFIG_SBUS
static int __devinit happy_meal_sbus_probe_one(struct platform_device *op, int is_qfe) static int happy_meal_sbus_probe_one(struct platform_device *op, int is_qfe)
{ {
struct device_node *dp = op->dev.of_node, *sbus_dp; struct device_node *dp = op->dev.of_node, *sbus_dp;
struct quattro *qp = NULL; struct quattro *qp = NULL;
...@@ -2927,7 +2927,7 @@ static void get_hme_mac_nonsparc(struct pci_dev *pdev, unsigned char *dev_addr) ...@@ -2927,7 +2927,7 @@ static void get_hme_mac_nonsparc(struct pci_dev *pdev, unsigned char *dev_addr)
} }
#endif /* !(CONFIG_SPARC) */ #endif /* !(CONFIG_SPARC) */
static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, static int happy_meal_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct quattro *qp = NULL; struct quattro *qp = NULL;
...@@ -3162,7 +3162,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, ...@@ -3162,7 +3162,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
return err; return err;
} }
static void __devexit happy_meal_pci_remove(struct pci_dev *pdev) static void happy_meal_pci_remove(struct pci_dev *pdev)
{ {
struct happy_meal *hp = dev_get_drvdata(&pdev->dev); struct happy_meal *hp = dev_get_drvdata(&pdev->dev);
struct net_device *net_dev = hp->dev; struct net_device *net_dev = hp->dev;
...@@ -3190,7 +3190,7 @@ static struct pci_driver hme_pci_driver = { ...@@ -3190,7 +3190,7 @@ static struct pci_driver hme_pci_driver = {
.name = "hme", .name = "hme",
.id_table = happymeal_pci_ids, .id_table = happymeal_pci_ids,
.probe = happy_meal_pci_probe, .probe = happy_meal_pci_probe,
.remove = __devexit_p(happy_meal_pci_remove), .remove = happy_meal_pci_remove,
}; };
static int __init happy_meal_pci_init(void) static int __init happy_meal_pci_init(void)
...@@ -3216,7 +3216,7 @@ static void happy_meal_pci_exit(void) ...@@ -3216,7 +3216,7 @@ static void happy_meal_pci_exit(void)
#ifdef CONFIG_SBUS #ifdef CONFIG_SBUS
static const struct of_device_id hme_sbus_match[]; static const struct of_device_id hme_sbus_match[];
static int __devinit hme_sbus_probe(struct platform_device *op) static int hme_sbus_probe(struct platform_device *op)
{ {
const struct of_device_id *match; const struct of_device_id *match;
struct device_node *dp = op->dev.of_node; struct device_node *dp = op->dev.of_node;
...@@ -3234,7 +3234,7 @@ static int __devinit hme_sbus_probe(struct platform_device *op) ...@@ -3234,7 +3234,7 @@ static int __devinit hme_sbus_probe(struct platform_device *op)
return happy_meal_sbus_probe_one(op, is_qfe); return happy_meal_sbus_probe_one(op, is_qfe);
} }
static int __devexit hme_sbus_remove(struct platform_device *op) static int hme_sbus_remove(struct platform_device *op)
{ {
struct happy_meal *hp = dev_get_drvdata(&op->dev); struct happy_meal *hp = dev_get_drvdata(&op->dev);
struct net_device *net_dev = hp->dev; struct net_device *net_dev = hp->dev;
...@@ -3284,7 +3284,7 @@ static struct platform_driver hme_sbus_driver = { ...@@ -3284,7 +3284,7 @@ static struct platform_driver hme_sbus_driver = {
.of_match_table = hme_sbus_match, .of_match_table = hme_sbus_match,
}, },
.probe = hme_sbus_probe, .probe = hme_sbus_probe,
.remove = __devexit_p(hme_sbus_remove), .remove = hme_sbus_remove,
}; };
static int __init happy_meal_sbus_init(void) static int __init happy_meal_sbus_init(void)
......
drivers/net/ethernet/sun/sunqe.c
View file @ f73d12bd
...@@ -744,7 +744,7 @@ static void qec_init_once(struct sunqec *qecp, struct platform_device *op) ...@@ -744,7 +744,7 @@ static void qec_init_once(struct sunqec *qecp, struct platform_device *op)
qecp->gregs + GLOB_RSIZE); qecp->gregs + GLOB_RSIZE);
} }
static u8 __devinit qec_get_burst(struct device_node *dp) static u8 qec_get_burst(struct device_node *dp)
{ {
u8 bsizes, bsizes_more; u8 bsizes, bsizes_more;
...@@ -764,7 +764,7 @@ static u8 __devinit qec_get_burst(struct device_node *dp) ...@@ -764,7 +764,7 @@ static u8 __devinit qec_get_burst(struct device_node *dp)
return bsizes; return bsizes;
} }
static struct sunqec * __devinit get_qec(struct platform_device *child) static struct sunqec *get_qec(struct platform_device *child)
{ {
struct platform_device *op = to_platform_device(child->dev.parent); struct platform_device *op = to_platform_device(child->dev.parent);
struct sunqec *qecp; struct sunqec *qecp;
...@@ -830,7 +830,7 @@ static const struct net_device_ops qec_ops = { ...@@ -830,7 +830,7 @@ static const struct net_device_ops qec_ops = {
.ndo_validate_addr = eth_validate_addr, .ndo_validate_addr = eth_validate_addr,
}; };
static int __devinit qec_ether_init(struct platform_device *op) static int qec_ether_init(struct platform_device *op)
{ {
static unsigned version_printed; static unsigned version_printed;
struct net_device *dev; struct net_device *dev;
...@@ -929,12 +929,12 @@ static int __devinit qec_ether_init(struct platform_device *op) ...@@ -929,12 +929,12 @@ static int __devinit qec_ether_init(struct platform_device *op)
return res; return res;
} }
static int __devinit qec_sbus_probe(struct platform_device *op) static int qec_sbus_probe(struct platform_device *op)
{ {
return qec_ether_init(op); return qec_ether_init(op);
} }
static int __devexit qec_sbus_remove(struct platform_device *op) static int qec_sbus_remove(struct platform_device *op)
{ {
struct sunqe *qp = dev_get_drvdata(&op->dev); struct sunqe *qp = dev_get_drvdata(&op->dev);
struct net_device *net_dev = qp->dev; struct net_device *net_dev = qp->dev;
...@@ -971,7 +971,7 @@ static struct platform_driver qec_sbus_driver = { ...@@ -971,7 +971,7 @@ static struct platform_driver qec_sbus_driver = {
.of_match_table = qec_sbus_match, .of_match_table = qec_sbus_match,
}, },
.probe = qec_sbus_probe, .probe = qec_sbus_probe,
.remove = __devexit_p(qec_sbus_remove), .remove = qec_sbus_remove,
}; };
static int __init qec_init(void) static int __init qec_init(void)
......
drivers/net/ethernet/sun/sunvnet.c
View file @ f73d12bd
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#define DRV_MODULE_VERSION "1.0" #define DRV_MODULE_VERSION "1.0"
#define DRV_MODULE_RELDATE "June 25, 2007" #define DRV_MODULE_RELDATE "June 25, 2007"
static char version[] __devinitdata = static char version[] =
DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
MODULE_AUTHOR("David S. Miller (davem@davemloft.net)"); MODULE_AUTHOR("David S. Miller (davem@davemloft.net)");
MODULE_DESCRIPTION("Sun LDOM virtual network driver"); MODULE_DESCRIPTION("Sun LDOM virtual network driver");
...@@ -937,7 +937,7 @@ static void vnet_port_free_tx_bufs(struct vnet_port *port) ...@@ -937,7 +937,7 @@ static void vnet_port_free_tx_bufs(struct vnet_port *port)
} }
} }
static int __devinit vnet_port_alloc_tx_bufs(struct vnet_port *port) static int vnet_port_alloc_tx_bufs(struct vnet_port *port)
{ {
struct vio_dring_state *dr; struct vio_dring_state *dr;
unsigned long len; unsigned long len;
...@@ -1019,7 +1019,7 @@ static const struct net_device_ops vnet_ops = { ...@@ -1019,7 +1019,7 @@ static const struct net_device_ops vnet_ops = {
.ndo_start_xmit = vnet_start_xmit, .ndo_start_xmit = vnet_start_xmit,
}; };
static struct vnet * __devinit vnet_new(const u64 *local_mac) static struct vnet *vnet_new(const u64 *local_mac)
{ {
struct net_device *dev; struct net_device *dev;
struct vnet *vp; struct vnet *vp;
...@@ -1067,7 +1067,7 @@ static struct vnet * __devinit vnet_new(const u64 *local_mac) ...@@ -1067,7 +1067,7 @@ static struct vnet * __devinit vnet_new(const u64 *local_mac)
return ERR_PTR(err); return ERR_PTR(err);
} }
static struct vnet * __devinit vnet_find_or_create(const u64 *local_mac) static struct vnet *vnet_find_or_create(const u64 *local_mac)
{ {
struct vnet *iter, *vp; struct vnet *iter, *vp;
...@@ -1088,7 +1088,7 @@ static struct vnet * __devinit vnet_find_or_create(const u64 *local_mac) ...@@ -1088,7 +1088,7 @@ static struct vnet * __devinit vnet_find_or_create(const u64 *local_mac)
static const char *local_mac_prop = "local-mac-address"; static const char *local_mac_prop = "local-mac-address";
static struct vnet * __devinit vnet_find_parent(struct mdesc_handle *hp, static struct vnet *vnet_find_parent(struct mdesc_handle *hp,
u64 port_node) u64 port_node)
{ {
const u64 *local_mac = NULL; const u64 *local_mac = NULL;
...@@ -1125,14 +1125,14 @@ static struct vio_driver_ops vnet_vio_ops = { ...@@ -1125,14 +1125,14 @@ static struct vio_driver_ops vnet_vio_ops = {
.handshake_complete = vnet_handshake_complete, .handshake_complete = vnet_handshake_complete,
}; };
static void __devinit print_version(void) static void print_version(void)
{ {
printk_once(KERN_INFO "%s", version); printk_once(KERN_INFO "%s", version);
} }
const char *remote_macaddr_prop = "remote-mac-address"; const char *remote_macaddr_prop = "remote-mac-address";
static int __devinit vnet_port_probe(struct vio_dev *vdev, static int vnet_port_probe(struct vio_dev *vdev,
const struct vio_device_id *id) const struct vio_device_id *id)
{ {
struct mdesc_handle *hp; struct mdesc_handle *hp;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7