diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-09-17 16:11:17 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:13 -0400 |
commit | 10d024c1b2fd58af8362670d7d6e5ae52fc33353 (patch) | |
tree | dbfb03c539986e2c1270385eb0083aaf0dfca8ab /drivers/net/irda | |
parent | 596c5c97431eab8465739c169401ea611127b9ad (diff) |
[NET]: Nuke SET_MODULE_OWNER macro.
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 <ralf@linux-mips.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/irda')
-rw-r--r-- | drivers/net/irda/ali-ircc.c | 4 | ||||
-rw-r--r-- | drivers/net/irda/donauboe.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/irda-usb.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/irport.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/kingsun-sir.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/ks959-sir.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/ksdazzle-sir.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/mcs7780.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/nsc-ircc.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/sir_dev.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/smsc-ircc2.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/stir4200.c | 1 | ||||
-rw-r--r-- | drivers/net/irda/via-ircc.c | 3 | ||||
-rw-r--r-- | drivers/net/irda/vlsi_ir.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/w83977af_ir.c | 3 |
15 files changed, 0 insertions, 27 deletions
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index f9c889c0dd07..9f584521304a 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c | |||
@@ -360,10 +360,6 @@ static int ali_ircc_open(int i, chipio_t *info) | |||
360 | self->tx_fifo.len = self->tx_fifo.ptr = self->tx_fifo.free = 0; | 360 | self->tx_fifo.len = self->tx_fifo.ptr = self->tx_fifo.free = 0; |
361 | self->tx_fifo.tail = self->tx_buff.head; | 361 | self->tx_fifo.tail = self->tx_buff.head; |
362 | 362 | ||
363 | |||
364 | /* Keep track of module usage */ | ||
365 | SET_MODULE_OWNER(dev); | ||
366 | |||
367 | /* Override the network functions we need to use */ | 363 | /* Override the network functions we need to use */ |
368 | dev->hard_start_xmit = ali_ircc_sir_hard_xmit; | 364 | dev->hard_start_xmit = ali_ircc_sir_hard_xmit; |
369 | dev->open = ali_ircc_net_open; | 365 | dev->open = ali_ircc_net_open; |
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c index 3ca47bf6dfec..3e5eca1aa987 100644 --- a/drivers/net/irda/donauboe.c +++ b/drivers/net/irda/donauboe.c | |||
@@ -1660,7 +1660,6 @@ toshoboe_open (struct pci_dev *pci_dev, const struct pci_device_id *pdid) | |||
1660 | } | 1660 | } |
1661 | #endif | 1661 | #endif |
1662 | 1662 | ||
1663 | SET_MODULE_OWNER(dev); | ||
1664 | SET_NETDEV_DEV(dev, &pci_dev->dev); | 1663 | SET_NETDEV_DEV(dev, &pci_dev->dev); |
1665 | dev->hard_start_xmit = toshoboe_hard_xmit; | 1664 | dev->hard_start_xmit = toshoboe_hard_xmit; |
1666 | dev->open = toshoboe_net_open; | 1665 | dev->open = toshoboe_net_open; |
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c index 3b0fd83fa266..c6355c00fd7a 100644 --- a/drivers/net/irda/irda-usb.c +++ b/drivers/net/irda/irda-usb.c | |||
@@ -1635,7 +1635,6 @@ static int irda_usb_probe(struct usb_interface *intf, | |||
1635 | if (!net) | 1635 | if (!net) |
1636 | goto err_out; | 1636 | goto err_out; |
1637 | 1637 | ||
1638 | SET_MODULE_OWNER(net); | ||
1639 | SET_NETDEV_DEV(net, &intf->dev); | 1638 | SET_NETDEV_DEV(net, &intf->dev); |
1640 | self = net->priv; | 1639 | self = net->priv; |
1641 | self->netdev = net; | 1640 | self->netdev = net; |
diff --git a/drivers/net/irda/irport.c b/drivers/net/irda/irport.c index 20732458f5ac..c79caa5d3d71 100644 --- a/drivers/net/irda/irport.c +++ b/drivers/net/irda/irport.c | |||
@@ -175,8 +175,6 @@ irport_open(int i, unsigned int iobase, unsigned int irq) | |||
175 | self->tx_buff.data = self->tx_buff.head; | 175 | self->tx_buff.data = self->tx_buff.head; |
176 | 176 | ||
177 | self->netdev = dev; | 177 | self->netdev = dev; |
178 | /* Keep track of module usage */ | ||
179 | SET_MODULE_OWNER(dev); | ||
180 | 178 | ||
181 | /* May be overridden by piggyback drivers */ | 179 | /* May be overridden by piggyback drivers */ |
182 | self->interrupt = irport_interrupt; | 180 | self->interrupt = irport_interrupt; |
diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c index a4adb74cccd2..648e54b3f00e 100644 --- a/drivers/net/irda/kingsun-sir.c +++ b/drivers/net/irda/kingsun-sir.c | |||
@@ -487,7 +487,6 @@ static int kingsun_probe(struct usb_interface *intf, | |||
487 | if(!net) | 487 | if(!net) |
488 | goto err_out1; | 488 | goto err_out1; |
489 | 489 | ||
490 | SET_MODULE_OWNER(net); | ||
491 | SET_NETDEV_DEV(net, &intf->dev); | 490 | SET_NETDEV_DEV(net, &intf->dev); |
492 | kingsun = netdev_priv(net); | 491 | kingsun = netdev_priv(net); |
493 | kingsun->irlap = NULL; | 492 | kingsun->irlap = NULL; |
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c index 407afba1a597..8c257a51341a 100644 --- a/drivers/net/irda/ks959-sir.c +++ b/drivers/net/irda/ks959-sir.c | |||
@@ -697,7 +697,6 @@ static int ks959_probe(struct usb_interface *intf, | |||
697 | if (!net) | 697 | if (!net) |
698 | goto err_out1; | 698 | goto err_out1; |
699 | 699 | ||
700 | SET_MODULE_OWNER(net); | ||
701 | SET_NETDEV_DEV(net, &intf->dev); | 700 | SET_NETDEV_DEV(net, &intf->dev); |
702 | kingsun = netdev_priv(net); | 701 | kingsun = netdev_priv(net); |
703 | kingsun->netdev = net; | 702 | kingsun->netdev = net; |
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c index 12b0e7a15bef..af60f2435a38 100644 --- a/drivers/net/irda/ksdazzle-sir.c +++ b/drivers/net/irda/ksdazzle-sir.c | |||
@@ -628,7 +628,6 @@ static int ksdazzle_probe(struct usb_interface *intf, | |||
628 | if (!net) | 628 | if (!net) |
629 | goto err_out1; | 629 | goto err_out1; |
630 | 630 | ||
631 | SET_MODULE_OWNER(net); | ||
632 | SET_NETDEV_DEV(net, &intf->dev); | 631 | SET_NETDEV_DEV(net, &intf->dev); |
633 | kingsun = netdev_priv(net); | 632 | kingsun = netdev_priv(net); |
634 | kingsun->netdev = net; | 633 | kingsun->netdev = net; |
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c index bfc57525bd6a..808939b9f8fb 100644 --- a/drivers/net/irda/mcs7780.c +++ b/drivers/net/irda/mcs7780.c | |||
@@ -898,8 +898,6 @@ static int mcs_probe(struct usb_interface *intf, | |||
898 | 898 | ||
899 | IRDA_DEBUG(1, "MCS7780 USB-IrDA bridge found at %d.\n", udev->devnum); | 899 | IRDA_DEBUG(1, "MCS7780 USB-IrDA bridge found at %d.\n", udev->devnum); |
900 | 900 | ||
901 | /* what is it realy for? */ | ||
902 | SET_MODULE_OWNER(ndev); | ||
903 | SET_NETDEV_DEV(ndev, &intf->dev); | 901 | SET_NETDEV_DEV(ndev, &intf->dev); |
904 | 902 | ||
905 | ret = usb_reset_configuration(udev); | 903 | ret = usb_reset_configuration(udev); |
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index d96c89751a71..12b9378c587f 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c | |||
@@ -437,7 +437,6 @@ static int __init nsc_ircc_open(chipio_t *info) | |||
437 | self->tx_fifo.tail = self->tx_buff.head; | 437 | self->tx_fifo.tail = self->tx_buff.head; |
438 | 438 | ||
439 | /* Override the network functions we need to use */ | 439 | /* Override the network functions we need to use */ |
440 | SET_MODULE_OWNER(dev); | ||
441 | dev->hard_start_xmit = nsc_ircc_hard_xmit_sir; | 440 | dev->hard_start_xmit = nsc_ircc_hard_xmit_sir; |
442 | dev->open = nsc_ircc_net_open; | 441 | dev->open = nsc_ircc_net_open; |
443 | dev->stop = nsc_ircc_net_close; | 442 | dev->stop = nsc_ircc_net_close; |
diff --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c index 9d6c8f391b2d..bbe4e094c424 100644 --- a/drivers/net/irda/sir_dev.c +++ b/drivers/net/irda/sir_dev.c | |||
@@ -913,8 +913,6 @@ struct sir_dev * sirdev_get_instance(const struct sir_driver *drv, const char *n | |||
913 | dev->drv = drv; | 913 | dev->drv = drv; |
914 | dev->netdev = ndev; | 914 | dev->netdev = ndev; |
915 | 915 | ||
916 | SET_MODULE_OWNER(ndev); | ||
917 | |||
918 | /* Override the network functions we need to use */ | 916 | /* Override the network functions we need to use */ |
919 | ndev->hard_start_xmit = sirdev_hard_xmit; | 917 | ndev->hard_start_xmit = sirdev_hard_xmit; |
920 | ndev->open = sirdev_open; | 918 | ndev->open = sirdev_open; |
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c index 36ab98386be0..029fdde2a4d3 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/net/irda/smsc-ircc2.c | |||
@@ -519,8 +519,6 @@ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u | |||
519 | goto err_out1; | 519 | goto err_out1; |
520 | } | 520 | } |
521 | 521 | ||
522 | SET_MODULE_OWNER(dev); | ||
523 | |||
524 | dev->hard_start_xmit = smsc_ircc_hard_xmit_sir; | 522 | dev->hard_start_xmit = smsc_ircc_hard_xmit_sir; |
525 | #if SMSC_IRCC2_C_NET_TIMEOUT | 523 | #if SMSC_IRCC2_C_NET_TIMEOUT |
526 | dev->tx_timeout = smsc_ircc_timeout; | 524 | dev->tx_timeout = smsc_ircc_timeout; |
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c index 755aa444a4dd..1afaee0fa7e0 100644 --- a/drivers/net/irda/stir4200.c +++ b/drivers/net/irda/stir4200.c | |||
@@ -1034,7 +1034,6 @@ static int stir_probe(struct usb_interface *intf, | |||
1034 | if(!net) | 1034 | if(!net) |
1035 | goto err_out1; | 1035 | goto err_out1; |
1036 | 1036 | ||
1037 | SET_MODULE_OWNER(net); | ||
1038 | SET_NETDEV_DEV(net, &intf->dev); | 1037 | SET_NETDEV_DEV(net, &intf->dev); |
1039 | stir = netdev_priv(net); | 1038 | stir = netdev_priv(net); |
1040 | stir->netdev = net; | 1039 | stir->netdev = net; |
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index ff5358574d0a..126ec7c8680e 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/net/irda/via-ircc.c | |||
@@ -429,9 +429,6 @@ static __devinit int via_ircc_open(int i, chipio_t * info, unsigned int id) | |||
429 | self->tx_fifo.len = self->tx_fifo.ptr = self->tx_fifo.free = 0; | 429 | self->tx_fifo.len = self->tx_fifo.ptr = self->tx_fifo.free = 0; |
430 | self->tx_fifo.tail = self->tx_buff.head; | 430 | self->tx_fifo.tail = self->tx_buff.head; |
431 | 431 | ||
432 | /* Keep track of module usage */ | ||
433 | SET_MODULE_OWNER(dev); | ||
434 | |||
435 | /* Override the network functions we need to use */ | 432 | /* Override the network functions we need to use */ |
436 | dev->hard_start_xmit = via_ircc_hard_xmit_sir; | 433 | dev->hard_start_xmit = via_ircc_hard_xmit_sir; |
437 | dev->open = via_ircc_net_open; | 434 | dev->open = via_ircc_net_open; |
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index 0538ca9ce058..acd082a96a4f 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c | |||
@@ -1584,8 +1584,6 @@ static int vlsi_irda_init(struct net_device *ndev) | |||
1584 | vlsi_irda_dev_t *idev = ndev->priv; | 1584 | vlsi_irda_dev_t *idev = ndev->priv; |
1585 | struct pci_dev *pdev = idev->pdev; | 1585 | struct pci_dev *pdev = idev->pdev; |
1586 | 1586 | ||
1587 | SET_MODULE_OWNER(ndev); | ||
1588 | |||
1589 | ndev->irq = pdev->irq; | 1587 | ndev->irq = pdev->irq; |
1590 | ndev->base_addr = pci_resource_start(pdev,0); | 1588 | ndev->base_addr = pci_resource_start(pdev,0); |
1591 | 1589 | ||
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c index 5182e800cc18..9fd2451b0fb2 100644 --- a/drivers/net/irda/w83977af_ir.c +++ b/drivers/net/irda/w83977af_ir.c | |||
@@ -232,9 +232,6 @@ int w83977af_open(int i, unsigned int iobase, unsigned int irq, | |||
232 | self->rx_buff.data = self->rx_buff.head; | 232 | self->rx_buff.data = self->rx_buff.head; |
233 | self->netdev = dev; | 233 | self->netdev = dev; |
234 | 234 | ||
235 | /* Keep track of module usage */ | ||
236 | SET_MODULE_OWNER(dev); | ||
237 | |||
238 | /* Override the network functions we need to use */ | 235 | /* Override the network functions we need to use */ |
239 | dev->hard_start_xmit = w83977af_hard_xmit; | 236 | dev->hard_start_xmit = w83977af_hard_xmit; |
240 | dev->open = w83977af_net_open; | 237 | dev->open = w83977af_net_open; |