Skip to content

Commit

Permalink
[NET]: Nuke SET_MODULE_OWNER macro.
Browse files Browse the repository at this point in the history 
It's been a useless no-op for long enough in 2.6 so I figured it's time to
remove it.  The number of people that could object because they're
maintaining unified 2.4 and 2.6 drivers is probably rather small.

[ Handled drivers added by netdev tree and some missed IRDA cases... -DaveM ]

Signed-off-by: Ralf Baechle <[email protected]>
Signed-off-by: Jeff Garzik <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
@ralfbaechle
ralfbaechle authored and David S. Miller committed Oct 10, 2007
1 parent 596c5c9 commit 10d024c
Show file tree
Hide file tree
Showing 251 changed files with 0 additions and 341 deletions.
1 change: 0 additions & 1 deletion drivers/ieee1394/eth1394.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,6 @@ static void ether1394_add_host(struct hpsb_host *host)
goto out;
}

SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &host->device);

priv = netdev_priv(dev);
Expand Down
1 change: 0 additions & 1 deletion drivers/infiniband/hw/amso1100/c2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,6 @@ static struct net_device *c2_devinit(struct c2_dev *c2dev,
return NULL;
}

SET_MODULE_OWNER(netdev);
SET_NETDEV_DEV(netdev, &c2dev->pcidev->dev);

netdev->open = c2_up;
Expand Down
1 change: 0 additions & 1 deletion drivers/infiniband/hw/amso1100/c2_provider.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,6 @@ static int c2_pseudo_change_mtu(struct net_device *netdev, int new_mtu)

static void setup(struct net_device *netdev)
{
SET_MODULE_OWNER(netdev);
netdev->open = c2_pseudo_up;
netdev->stop = c2_pseudo_down;
netdev->hard_start_xmit = c2_pseudo_xmit_frame;
Expand Down
2 changes: 0 additions & 2 deletions drivers/infiniband/ulp/ipoib/ipoib_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -978,8 +978,6 @@ static void ipoib_setup(struct net_device *dev)

netif_carrier_off(dev);

SET_MODULE_OWNER(dev);

priv->dev = dev;

spin_lock_init(&priv->lock);
Expand Down
2 changes: 0 additions & 2 deletions drivers/message/fusion/mptlan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1427,8 +1427,6 @@ mpt_register_lan_device (MPT_ADAPTER *mpt_dev, int pnum)
dlprintk((KERN_INFO MYNAM ": Finished registering dev "
"and setting initial values\n"));

SET_MODULE_OWNER(dev);

if (register_netdev(dev) != 0) {
free_netdev(dev);
dev = NULL;
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/3c501.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,6 @@ struct net_device * __init el1_probe(int unit)
mem_start = dev->mem_start & 7;
}

SET_MODULE_OWNER(dev);

if (io > 0x1ff) { /* Check a single specified location. */
err = el1_probe1(dev, io);
} else if (io != 0) {
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/3c503.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ static int __init do_el2_probe(struct net_device *dev)
int base_addr = dev->base_addr;
int irq = dev->irq;

SET_MODULE_OWNER(dev);

if (base_addr > 0x1ff) /* Check a single specified location. */
return el2_probe1(dev, base_addr);
else if (base_addr != 0) /* Don't probe at all. */
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/3c505.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1387,8 +1387,6 @@ static int __init elplus_setup(struct net_device *dev)
unsigned long cookie = 0;
int err = -ENODEV;

SET_MODULE_OWNER(dev);

/*
* setup adapter structure
*/
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/3c507.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,6 @@ struct net_device * __init el16_probe(int unit)
mem_start = dev->mem_start & 15;
}

SET_MODULE_OWNER(dev);

if (io > 0x1ff) /* Check a single specified location. */
err = el16_probe1(dev, io);
else if (io != 0)
Expand Down
6 changes: 0 additions & 6 deletions drivers/net/3c509.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,6 @@ static int __init el3_probe(int card_idx)
return -ENOMEM;
}

SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &idev->dev);
pnp_cards++;

Expand Down Expand Up @@ -524,8 +523,6 @@ static int __init el3_probe(int card_idx)
if (!dev)
return -ENOMEM;

SET_MODULE_OWNER(dev);

netdev_boot_setup_check(dev);

/* Set passed-in IRQ or I/O Addr. */
Expand Down Expand Up @@ -644,7 +641,6 @@ static int __init el3_mca_probe(struct device *device)
return -ENOMEM;
}

SET_MODULE_OWNER(dev);
netdev_boot_setup_check(dev);

memcpy(dev->dev_addr, phys_addr, sizeof(phys_addr));
Expand Down Expand Up @@ -704,8 +700,6 @@ static int __init el3_eisa_probe (struct device *device)
return -ENOMEM;
}

SET_MODULE_OWNER(dev);

netdev_boot_setup_check(dev);

memcpy(dev->dev_addr, phys_addr, sizeof(phys_addr));
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/3c515.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -501,8 +501,6 @@ static struct net_device *corkscrew_scan(int unit)
netdev_boot_setup_check(dev);
}

SET_MODULE_OWNER(dev);

#ifdef __ISAPNP__
if(nopnp == 1)
goto no_pnp;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/3c523.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,6 @@ static int __init do_elmc_probe(struct net_device *dev)
int retval;
struct priv *pr = dev->priv;

SET_MODULE_OWNER(dev);
if (MCA_bus == 0) {
return -ENODEV;
}
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/3c527.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,6 @@ struct net_device *__init mc32_probe(int unit)
if (unit >= 0)
sprintf(dev->name, "eth%d", unit);

SET_MODULE_OWNER(dev);

/* Do not check any supplied i/o locations.
POS registers usually don't fail :) */

Expand Down
1 change: 0 additions & 1 deletion drivers/net/3c59x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1036,7 +1036,6 @@ static int __devinit vortex_probe1(struct device *gendev,
printk (KERN_ERR PFX "unable to allocate etherdev, aborting\n");
goto out;
}
SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, gendev);
vp = netdev_priv(dev);

Expand Down
1 change: 0 additions & 1 deletion drivers/net/8139cp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1845,7 +1845,6 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
dev = alloc_etherdev(sizeof(struct cp_private));
if (!dev)
return -ENOMEM;
SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev);

cp = netdev_priv(dev);
Expand Down
1 change: 0 additions & 1 deletion drivers/net/8139too.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,6 @@ static int __devinit rtl8139_init_board (struct pci_dev *pdev,
dev_err(&pdev->dev, "Unable to alloc new net device\n");
return -ENOMEM;
}
SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev);

tp = netdev_priv(dev);
Expand Down
1 change: 0 additions & 1 deletion drivers/net/82596.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1234,7 +1234,6 @@ struct net_device * __init i82596_probe(int unit)
DEB(DEB_PROBE,printk(KERN_INFO "%s", version));

/* The 82596-specific entries in the device structure. */
SET_MODULE_OWNER(dev);
dev->open = i596_open;
dev->stop = i596_close;
dev->hard_start_xmit = i596_start_xmit;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/a2065.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,6 @@ static int __devinit a2065_init_one(struct zorro_dev *z,
return -ENOMEM;
}

SET_MODULE_OWNER(dev);
priv = netdev_priv(dev);

r1->name = dev->name;
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/ac3200.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@ static int __init do_ac3200_probe(struct net_device *dev)
int irq = dev->irq;
int mem_start = dev->mem_start;

SET_MODULE_OWNER(dev);

if (ioaddr > 0x1ff) /* Check a single specified location. */
return ac_probe1(ioaddr, dev);
else if (ioaddr > 0) /* Don't probe at all. */
Expand Down
1 change: 0 additions & 1 deletion drivers/net/acenic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,6 @@ static int __devinit acenic_probe_one(struct pci_dev *pdev,
return -ENOMEM;
}

SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev);

ap = dev->priv;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/amd8111e.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1982,7 +1982,6 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
goto err_free_reg;
}

SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev);

#if AMD8111E_VLAN_TAG_USED
Expand Down
1 change: 0 additions & 1 deletion drivers/net/apne.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ struct net_device * __init apne_probe(int unit)
sprintf(dev->name, "eth%d", unit);
netdev_boot_setup_check(dev);
}
SET_MODULE_OWNER(dev);

/* disable pcmcia irq for readtuple */
pcmcia_disable_irq();
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/appletalk/cops.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,6 @@ struct net_device * __init cops_probe(int unit)
base_addr = dev->base_addr = io;
}

SET_MODULE_OWNER(dev);

if (base_addr > 0x1ff) { /* Check a single specified location. */
err = cops_probe1(dev, base_addr);
} else if (base_addr != 0) { /* Don't probe at all. */
Expand Down
1 change: 0 additions & 1 deletion drivers/net/appletalk/ipddp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ static struct net_device * __init ipddp_init(void)
if (!dev)
return ERR_PTR(-ENOMEM);

SET_MODULE_OWNER(dev);
strcpy(dev->name, "ipddp%d");

if (version_printed++ == 0)
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/appletalk/ltpc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1046,8 +1046,6 @@ struct net_device * __init ltpc_probe(void)
if (!dev)
goto out;

SET_MODULE_OWNER(dev);

/* probe for the I/O port address */

if (io != 0x240 && request_region(0x220,8,"ltpc")) {
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/arcnet/com90io.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,6 @@ static int __init com90io_init(void)
if (!dev)
return -ENOMEM;

SET_MODULE_OWNER(dev);

dev->base_addr = io;
dev->irq = irq;
if (dev->irq == 2)
Expand Down
1 change: 0 additions & 1 deletion drivers/net/ariadne.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
return -ENOMEM;
}

SET_MODULE_OWNER(dev);
priv = netdev_priv(dev);

r1->name = dev->name;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/arm/at91_ether.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,6 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add

dev->base_addr = AT91_VA_BASE_EMAC;
dev->irq = AT91RM9200_ID_EMAC;
SET_MODULE_OWNER(dev);

/* Install the interrupt handler */
if (request_irq(dev->irq, at91ether_interrupt, 0, dev->name, dev)) {
Expand Down
1 change: 0 additions & 1 deletion drivers/net/arm/ether1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,6 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
goto release;
}

SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &ec->dev);

dev->irq = ec->irq;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/arm/ether3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,6 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
goto release;
}

SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &ec->dev);

priv(dev)->base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
Expand Down
1 change: 0 additions & 1 deletion drivers/net/arm/etherh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,6 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
goto release;
}

SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &ec->dev);

dev->open = etherh_open;
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/at1700.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,6 @@ struct net_device * __init at1700_probe(int unit)
dev->irq = irq;
}

SET_MODULE_OWNER(dev);

if (io > 0x1ff) { /* Check a single specified location. */
err = at1700_probe1(dev, io);
} else if (io != 0) { /* Don't probe at all. */
Expand Down
1 change: 0 additions & 1 deletion drivers/net/atarilance.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,6 @@ struct net_device * __init atarilance_probe(int unit)
sprintf(dev->name, "eth%d", unit);
netdev_boot_setup_check(dev);
}
SET_MODULE_OWNER(dev);

for( i = 0; i < N_LANCE_ADDR; ++i ) {
if (lance_probe1( dev, &lance_addr_list[i] )) {
Expand Down
1 change: 0 additions & 1 deletion drivers/net/atl1/atl1_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2234,7 +2234,6 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
err = -ENOMEM;
goto err_alloc_etherdev;
}
SET_MODULE_OWNER(netdev);
SET_NETDEV_DEV(netdev, &pdev->dev);

pci_set_drvdata(pdev, netdev);
Expand Down
1 change: 0 additions & 1 deletion drivers/net/atp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,6 @@ static int __init atp_probe1(long ioaddr)
dev = alloc_etherdev(sizeof(struct net_local));
if (!dev)
return -ENOMEM;
SET_MODULE_OWNER(dev);

/* Find the IRQ used by triggering an interrupt. */
write_reg_byte(ioaddr, CMR2, 0x01); /* No accept mode, IRQ out. */
Expand Down
1 change: 0 additions & 1 deletion drivers/net/b44.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2151,7 +2151,6 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
goto err_out_free_res;
}

SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev,&pdev->dev);

/* No interesting netdevice features in this card... */
Expand Down
1 change: 0 additions & 1 deletion drivers/net/bfin_mac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,6 @@ static int bfin_mac_probe(struct platform_device *pdev)
return -ENOMEM;
}

SET_MODULE_OWNER(ndev);
SET_NETDEV_DEV(ndev, &pdev->dev);

platform_set_drvdata(pdev, ndev);
Expand Down
1 change: 0 additions & 1 deletion drivers/net/bmac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1291,7 +1291,6 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
}

bp = netdev_priv(dev);
SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &mdev->ofdev.dev);
macio_set_drvdata(mdev, dev);

Expand Down
1 change: 0 additions & 1 deletion drivers/net/bnx2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6474,7 +6474,6 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
u32 reg;
u64 dma_mask, persist_dma_mask;

SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev);
bp = netdev_priv(dev);

Expand Down
2 changes: 0 additions & 2 deletions drivers/net/bonding/bond_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4674,8 +4674,6 @@ int bond_create(char *name, struct bond_params *params, struct bonding **newbond
goto out_netdev;
}

SET_MODULE_OWNER(bond_dev);

res = register_netdevice(bond_dev);
if (res < 0) {
goto out_bond;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/cassini.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4900,7 +4900,6 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
err = -ENOMEM;
goto err_out_disable_pdev;
}
SET_MODULE_OWNER(dev);
SET_NETDEV_DEV(dev, &pdev->dev);

err = pci_request_regions(pdev, dev->name);
Expand Down
1 change: 0 additions & 1 deletion drivers/net/chelsio/cxgb2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1036,7 +1036,6 @@ static int __devinit init_one(struct pci_dev *pdev,
goto out_free_dev;
}

SET_MODULE_OWNER(netdev);
SET_NETDEV_DEV(netdev, &pdev->dev);

if (!adapter) {
Expand Down
1 change: 0 additions & 1 deletion drivers/net/cs89x0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,6 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
int eeprom_buff[CHKSUM_LEN];
int retval;

SET_MODULE_OWNER(dev);
/* Initialize the device structure. */
if (!modular) {
memset(lp, 0, sizeof(*lp));
Expand Down
1 change: 0 additions & 1 deletion drivers/net/cxgb3/cxgb3_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2465,7 +2465,6 @@ static int __devinit init_one(struct pci_dev *pdev,
goto out_free_dev;
}

SET_MODULE_OWNER(netdev);
SET_NETDEV_DEV(netdev, &pdev->dev);

adapter->port[i] = netdev;
Expand Down
1 change: 0 additions & 1 deletion drivers/net/de600.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,6 @@ static struct net_device * __init de600_probe(void)
if (!dev)
return ERR_PTR(-ENOMEM);

SET_MODULE_OWNER(dev);

if (!request_region(DE600_IO, 3, "de600")) {
printk(KERN_WARNING "DE600: port 0x%x busy\n", DE600_IO);
Expand Down
Loading

0 comments on commit 10d024c

Please sign in to comment.