hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pcnet32: change to use netdev_priv 

use netdev_priv() instead of dev->priv

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Don Fry <pcnet32@verizon.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Don Fry 2007-03-06 10:55:00 -08:00 committed by Jeff Garzik
parent 6ecb766710
commit 1e56a4b402
1 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
drivers/net/pcnet32.c
View File

@ -653,7 +653,7 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
static void pcnet32_purge_rx_ring(struct net_device *dev) static void pcnet32_purge_rx_ring(struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
int i; int i;
/* free all allocated skbuffs */ /* free all allocated skbuffs */
@ -681,7 +681,7 @@ static void pcnet32_poll_controller(struct net_device *dev)
static int pcnet32_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int pcnet32_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
unsigned long flags; unsigned long flags;
int r = -EOPNOTSUPP; int r = -EOPNOTSUPP;
@ -696,7 +696,7 @@ static int pcnet32_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
static int pcnet32_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int pcnet32_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
unsigned long flags; unsigned long flags;
int r = -EOPNOTSUPP; int r = -EOPNOTSUPP;
@ -711,7 +711,7 @@ static int pcnet32_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
static void pcnet32_get_drvinfo(struct net_device *dev, static void pcnet32_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info) struct ethtool_drvinfo *info)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
strcpy(info->driver, DRV_NAME); strcpy(info->driver, DRV_NAME);
strcpy(info->version, DRV_VERSION); strcpy(info->version, DRV_VERSION);
@ -723,7 +723,7 @@ static void pcnet32_get_drvinfo(struct net_device *dev,
static u32 pcnet32_get_link(struct net_device *dev) static u32 pcnet32_get_link(struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
unsigned long flags; unsigned long flags;
int r; int r;
@ -743,19 +743,19 @@ static u32 pcnet32_get_link(struct net_device *dev)
static u32 pcnet32_get_msglevel(struct net_device *dev) static u32 pcnet32_get_msglevel(struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
return lp->msg_enable; return lp->msg_enable;
} }
static void pcnet32_set_msglevel(struct net_device *dev, u32 value) static void pcnet32_set_msglevel(struct net_device *dev, u32 value)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
lp->msg_enable = value; lp->msg_enable = value;
} }
static int pcnet32_nway_reset(struct net_device *dev) static int pcnet32_nway_reset(struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
unsigned long flags; unsigned long flags;
int r = -EOPNOTSUPP; int r = -EOPNOTSUPP;
@ -770,7 +770,7 @@ static int pcnet32_nway_reset(struct net_device *dev)
static void pcnet32_get_ringparam(struct net_device *dev, static void pcnet32_get_ringparam(struct net_device *dev,
struct ethtool_ringparam *ering) struct ethtool_ringparam *ering)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
ering->tx_max_pending = TX_MAX_RING_SIZE; ering->tx_max_pending = TX_MAX_RING_SIZE;
ering->tx_pending = lp->tx_ring_size; ering->tx_pending = lp->tx_ring_size;
@ -781,7 +781,7 @@ static void pcnet32_get_ringparam(struct net_device *dev,
static int pcnet32_set_ringparam(struct net_device *dev, static int pcnet32_set_ringparam(struct net_device *dev,
struct ethtool_ringparam *ering) struct ethtool_ringparam *ering)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
unsigned long flags; unsigned long flags;
unsigned int size; unsigned int size;
ulong ioaddr = dev->base_addr; ulong ioaddr = dev->base_addr;
@ -847,7 +847,7 @@ static int pcnet32_self_test_count(struct net_device *dev)
static void pcnet32_ethtool_test(struct net_device *dev, static void pcnet32_ethtool_test(struct net_device *dev,
struct ethtool_test *test, u64 * data) struct ethtool_test *test, u64 * data)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
int rc; int rc;
if (test->flags == ETH_TEST_FL_OFFLINE) { if (test->flags == ETH_TEST_FL_OFFLINE) {
@ -868,7 +868,7 @@ static void pcnet32_ethtool_test(struct net_device *dev,
static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1) static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
struct pcnet32_access *a = &lp->a; /* access to registers */ struct pcnet32_access *a = &lp->a; /* access to registers */
ulong ioaddr = dev->base_addr; /* card base I/O address */ ulong ioaddr = dev->base_addr; /* card base I/O address */
struct sk_buff *skb; /* sk buff */ struct sk_buff *skb; /* sk buff */
@ -1047,7 +1047,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
static void pcnet32_led_blink_callback(struct net_device *dev) static void pcnet32_led_blink_callback(struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
struct pcnet32_access *a = &lp->a; struct pcnet32_access *a = &lp->a;
ulong ioaddr = dev->base_addr; ulong ioaddr = dev->base_addr;
unsigned long flags; unsigned long flags;
@ -1064,7 +1064,7 @@ static void pcnet32_led_blink_callback(struct net_device *dev)
static int pcnet32_phys_id(struct net_device *dev, u32 data) static int pcnet32_phys_id(struct net_device *dev, u32 data)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
struct pcnet32_access *a = &lp->a; struct pcnet32_access *a = &lp->a;
ulong ioaddr = dev->base_addr; ulong ioaddr = dev->base_addr;
unsigned long flags; unsigned long flags;
@ -1109,7 +1109,7 @@ static int pcnet32_suspend(struct net_device *dev, unsigned long *flags,
int can_sleep) int can_sleep)
{ {
int csr5; int csr5;
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
struct pcnet32_access *a = &lp->a; struct pcnet32_access *a = &lp->a;
ulong ioaddr = dev->base_addr; ulong ioaddr = dev->base_addr;
int ticks; int ticks;
@ -1257,7 +1257,7 @@ static void pcnet32_rx_entry(struct net_device *dev,
static int pcnet32_rx(struct net_device *dev, int quota) static int pcnet32_rx(struct net_device *dev, int quota)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
int entry = lp->cur_rx & lp->rx_mod_mask; int entry = lp->cur_rx & lp->rx_mod_mask;
struct pcnet32_rx_head *rxp = &lp->rx_ring[entry]; struct pcnet32_rx_head *rxp = &lp->rx_ring[entry];
int npackets = 0; int npackets = 0;
@ -1282,7 +1282,7 @@ static int pcnet32_rx(struct net_device *dev, int quota)
static int pcnet32_tx(struct net_device *dev) static int pcnet32_tx(struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
unsigned int dirty_tx = lp->dirty_tx; unsigned int dirty_tx = lp->dirty_tx;
int delta; int delta;
int must_restart = 0; int must_restart = 0;
@ -1381,7 +1381,7 @@ static int pcnet32_tx(struct net_device *dev)
#ifdef CONFIG_PCNET32_NAPI #ifdef CONFIG_PCNET32_NAPI
static int pcnet32_poll(struct net_device *dev, int *budget) static int pcnet32_poll(struct net_device *dev, int *budget)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
int quota = min(dev->quota, *budget); int quota = min(dev->quota, *budget);
unsigned long ioaddr = dev->base_addr; unsigned long ioaddr = dev->base_addr;
unsigned long flags; unsigned long flags;
@ -1428,7 +1428,7 @@ static int pcnet32_poll(struct net_device *dev, int *budget)
#define PCNET32_MAX_PHYS 32 #define PCNET32_MAX_PHYS 32
static int pcnet32_get_regs_len(struct net_device *dev) static int pcnet32_get_regs_len(struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
int j = lp->phycount * PCNET32_REGS_PER_PHY; int j = lp->phycount * PCNET32_REGS_PER_PHY;
return ((PCNET32_NUM_REGS + j) * sizeof(u16)); return ((PCNET32_NUM_REGS + j) * sizeof(u16));
@ -1439,7 +1439,7 @@ static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
{ {
int i, csr0; int i, csr0;
u16 *buff = ptr; u16 *buff = ptr;
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
struct pcnet32_access *a = &lp->a; struct pcnet32_access *a = &lp->a;
ulong ioaddr = dev->base_addr; ulong ioaddr = dev->base_addr;
unsigned long flags; unsigned long flags;
@ -1804,7 +1804,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
} }
dev->base_addr = ioaddr; dev->base_addr = ioaddr;
lp = dev->priv; lp = netdev_priv(dev);
/* pci_alloc_consistent returns page-aligned memory, so we do not have to check the alignment */ /* pci_alloc_consistent returns page-aligned memory, so we do not have to check the alignment */
if ((lp->init_block = if ((lp->init_block =
pci_alloc_consistent(pdev, sizeof(*lp->init_block), &lp->init_dma_addr)) == NULL) { pci_alloc_consistent(pdev, sizeof(*lp->init_block), &lp->init_dma_addr)) == NULL) {
@ -1998,7 +1998,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
/* if any allocation fails, caller must also call pcnet32_free_ring */ /* if any allocation fails, caller must also call pcnet32_free_ring */
static int pcnet32_alloc_ring(struct net_device *dev, char *name) static int pcnet32_alloc_ring(struct net_device *dev, char *name)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
lp->tx_ring = pci_alloc_consistent(lp->pci_dev, lp->tx_ring = pci_alloc_consistent(lp->pci_dev,
sizeof(struct pcnet32_tx_head) * sizeof(struct pcnet32_tx_head) *
@ -2065,7 +2065,7 @@ static int pcnet32_alloc_ring(struct net_device *dev, char *name)
static void pcnet32_free_ring(struct net_device *dev) static void pcnet32_free_ring(struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
kfree(lp->tx_skbuff); kfree(lp->tx_skbuff);
lp->tx_skbuff = NULL; lp->tx_skbuff = NULL;
@ -2098,7 +2098,7 @@ static void pcnet32_free_ring(struct net_device *dev)
static int pcnet32_open(struct net_device *dev) static int pcnet32_open(struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
unsigned long ioaddr = dev->base_addr; unsigned long ioaddr = dev->base_addr;
u16 val; u16 val;
int i; int i;
@ -2344,7 +2344,7 @@ static int pcnet32_open(struct net_device *dev)
static void pcnet32_purge_tx_ring(struct net_device *dev) static void pcnet32_purge_tx_ring(struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
int i; int i;
for (i = 0; i < lp->tx_ring_size; i++) { for (i = 0; i < lp->tx_ring_size; i++) {
@ -2364,7 +2364,7 @@ static void pcnet32_purge_tx_ring(struct net_device *dev)
/* Initialize the PCNET32 Rx and Tx rings. */ /* Initialize the PCNET32 Rx and Tx rings. */
static int pcnet32_init_ring(struct net_device *dev) static int pcnet32_init_ring(struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
int i; int i;
lp->tx_full = 0; lp->tx_full = 0;
@ -2422,7 +2422,7 @@ static int pcnet32_init_ring(struct net_device *dev)
*/ */
static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits) static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
unsigned long ioaddr = dev->base_addr; unsigned long ioaddr = dev->base_addr;
int i; int i;
@ -2452,7 +2452,7 @@ static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits)
static void pcnet32_tx_timeout(struct net_device *dev) static void pcnet32_tx_timeout(struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
unsigned long ioaddr = dev->base_addr, flags; unsigned long ioaddr = dev->base_addr, flags;
spin_lock_irqsave(&lp->lock, flags); spin_lock_irqsave(&lp->lock, flags);
@ -2493,7 +2493,7 @@ static void pcnet32_tx_timeout(struct net_device *dev)
static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev) static int pcnet32_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
unsigned long ioaddr = dev->base_addr; unsigned long ioaddr = dev->base_addr;
u16 status; u16 status;
int entry; int entry;
@ -2558,7 +2558,7 @@ pcnet32_interrupt(int irq, void *dev_id)
int boguscnt = max_interrupt_work; int boguscnt = max_interrupt_work;
ioaddr = dev->base_addr; ioaddr = dev->base_addr;
lp = dev->priv; lp = netdev_priv(dev);
spin_lock(&lp->lock); spin_lock(&lp->lock);
@ -2640,7 +2640,7 @@ pcnet32_interrupt(int irq, void *dev_id)
static int pcnet32_close(struct net_device *dev) static int pcnet32_close(struct net_device *dev)
{ {
unsigned long ioaddr = dev->base_addr; unsigned long ioaddr = dev->base_addr;
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
unsigned long flags; unsigned long flags;
del_timer_sync(&lp->watchdog_timer); del_timer_sync(&lp->watchdog_timer);
@ -2681,7 +2681,7 @@ static int pcnet32_close(struct net_device *dev)
static struct net_device_stats *pcnet32_get_stats(struct net_device *dev) static struct net_device_stats *pcnet32_get_stats(struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
unsigned long ioaddr = dev->base_addr; unsigned long ioaddr = dev->base_addr;
unsigned long flags; unsigned long flags;
@ -2695,7 +2695,7 @@ static struct net_device_stats *pcnet32_get_stats(struct net_device *dev)
/* taken from the sunlance driver, which it took from the depca driver */ /* taken from the sunlance driver, which it took from the depca driver */
static void pcnet32_load_multicast(struct net_device *dev) static void pcnet32_load_multicast(struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
volatile struct pcnet32_init_block *ib = lp->init_block; volatile struct pcnet32_init_block *ib = lp->init_block;
volatile u16 *mcast_table = (u16 *) & ib->filter; volatile u16 *mcast_table = (u16 *) & ib->filter;
struct dev_mc_list *dmi = dev->mc_list; struct dev_mc_list *dmi = dev->mc_list;
@ -2745,7 +2745,7 @@ static void pcnet32_load_multicast(struct net_device *dev)
static void pcnet32_set_multicast_list(struct net_device *dev) static void pcnet32_set_multicast_list(struct net_device *dev)
{ {
unsigned long ioaddr = dev->base_addr, flags; unsigned long ioaddr = dev->base_addr, flags;
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
int csr15, suspended; int csr15, suspended;
spin_lock_irqsave(&lp->lock, flags); spin_lock_irqsave(&lp->lock, flags);
@ -2784,7 +2784,7 @@ static void pcnet32_set_multicast_list(struct net_device *dev)
/* This routine assumes that the lp->lock is held */ /* This routine assumes that the lp->lock is held */
static int mdio_read(struct net_device *dev, int phy_id, int reg_num) static int mdio_read(struct net_device *dev, int phy_id, int reg_num)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
unsigned long ioaddr = dev->base_addr; unsigned long ioaddr = dev->base_addr;
u16 val_out; u16 val_out;
@ -2800,7 +2800,7 @@ static int mdio_read(struct net_device *dev, int phy_id, int reg_num)
/* This routine assumes that the lp->lock is held */ /* This routine assumes that the lp->lock is held */
static void mdio_write(struct net_device *dev, int phy_id, int reg_num, int val) static void mdio_write(struct net_device *dev, int phy_id, int reg_num, int val)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
unsigned long ioaddr = dev->base_addr; unsigned long ioaddr = dev->base_addr;
if (!lp->mii) if (!lp->mii)
@ -2812,7 +2812,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int reg_num, int val)
static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
int rc; int rc;
unsigned long flags; unsigned long flags;
@ -2830,7 +2830,7 @@ static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
static int pcnet32_check_otherphy(struct net_device *dev) static int pcnet32_check_otherphy(struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
struct mii_if_info mii = lp->mii_if; struct mii_if_info mii = lp->mii_if;
u16 bmcr; u16 bmcr;
int i; int i;
@ -2877,7 +2877,7 @@ static int pcnet32_check_otherphy(struct net_device *dev)
static void pcnet32_check_media(struct net_device *dev, int verbose) static void pcnet32_check_media(struct net_device *dev, int verbose)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
int curr_link; int curr_link;
int prev_link = netif_carrier_ok(dev) ? 1 : 0; int prev_link = netif_carrier_ok(dev) ? 1 : 0;
u32 bcr9; u32 bcr9;
@ -2933,7 +2933,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)
static void pcnet32_watchdog(struct net_device *dev) static void pcnet32_watchdog(struct net_device *dev)
{ {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
unsigned long flags; unsigned long flags;
/* Print the link status if it has changed */ /* Print the link status if it has changed */
@ -2949,7 +2949,7 @@ static void __devexit pcnet32_remove_one(struct pci_dev *pdev)
struct net_device *dev = pci_get_drvdata(pdev); struct net_device *dev = pci_get_drvdata(pdev);
if (dev) { if (dev) {
struct pcnet32_private *lp = dev->priv; struct pcnet32_private *lp = netdev_priv(dev);
unregister_netdev(dev); unregister_netdev(dev);
pcnet32_free_ring(dev); pcnet32_free_ring(dev);
@ -3030,7 +3030,7 @@ static void __exit pcnet32_cleanup_module(void)
struct net_device *next_dev; struct net_device *next_dev;
while (pcnet32_dev) { while (pcnet32_dev) {
struct pcnet32_private *lp = pcnet32_dev->priv; struct pcnet32_private *lp = netdev_priv(pcnet32_dev);
next_dev = lp->next; next_dev = lp->next;
unregister_netdev(pcnet32_dev); unregister_netdev(pcnet32_dev);
pcnet32_free_ring(pcnet32_dev); pcnet32_free_ring(pcnet32_dev);