Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6c52ba1 authored by Kees Cook's avatar Kees Cook Committed by David S. Miller
Browse files

drivers/net: amd: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Allen Pais <allen.lkml@gmail.com>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c63144e4

drivers/net/ethernet/amd/a2065.c

+10 −3
Original line number Original line Diff line number Diff line
@@ -123,6 +123,7 @@ struct lance_private { 
	int burst_sizes;	      /* ledma SBus burst sizes */

	int burst_sizes;	      /* ledma SBus burst sizes */

#endif

#endif

	struct timer_list         multicast_timer;

	struct timer_list         multicast_timer;

	struct net_device	  *dev;

};

};





#define LANCE_ADDR(x) ((int)(x) & ~0xff000000)

#define LANCE_ADDR(x) ((int)(x) & ~0xff000000)
@@ -638,6 +639,13 @@ static void lance_set_multicast(struct net_device *dev) 
	netif_wake_queue(dev);

	netif_wake_queue(dev);

}

}





static void lance_set_multicast_retry(struct timer_list *t)

{

	struct lance_private *lp = from_timer(lp, t, multicast_timer);



	lance_set_multicast(lp->dev);

}



static int a2065_init_one(struct zorro_dev *z,

static int a2065_init_one(struct zorro_dev *z,

			  const struct zorro_device_id *ent);

			  const struct zorro_device_id *ent);

static void a2065_remove_one(struct zorro_dev *z);

static void a2065_remove_one(struct zorro_dev *z);
@@ -728,14 +736,13 @@ static int a2065_init_one(struct zorro_dev *z, 
	priv->lance_log_tx_bufs = LANCE_LOG_TX_BUFFERS;

	priv->lance_log_tx_bufs = LANCE_LOG_TX_BUFFERS;

	priv->rx_ring_mod_mask = RX_RING_MOD_MASK;

	priv->rx_ring_mod_mask = RX_RING_MOD_MASK;

	priv->tx_ring_mod_mask = TX_RING_MOD_MASK;

	priv->tx_ring_mod_mask = TX_RING_MOD_MASK;

	priv->dev = dev;





	dev->netdev_ops = &lance_netdev_ops;

	dev->netdev_ops = &lance_netdev_ops;

	dev->watchdog_timeo = 5*HZ;

	dev->watchdog_timeo = 5*HZ;

	dev->dma = 0;

	dev->dma = 0;





	setup_timer(&priv->multicast_timer,

	timer_setup(&priv->multicast_timer, lance_set_multicast_retry, 0);

		    (void(*)(unsigned long))lance_set_multicast,

		    (unsigned long)dev);





	err = register_netdev(dev);

	err = register_netdev(dev);

	if (err) {

	if (err) {

drivers/net/ethernet/amd/am79c961a.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -302,10 +302,10 @@ am79c961_init_for_open(struct net_device *dev) 
	write_rreg (dev->base_addr, CSR0, CSR0_IENA|CSR0_STRT);

	write_rreg (dev->base_addr, CSR0, CSR0_IENA|CSR0_STRT);

}

}





static void am79c961_timer(unsigned long data)

static void am79c961_timer(struct timer_list *t)

{

{

	struct net_device *dev = (struct net_device *)data;

	struct dev_priv *priv = from_timer(priv, t, timer);

	struct dev_priv *priv = netdev_priv(dev);

	struct net_device *dev = priv->dev;

	unsigned int lnkstat, carrier;

	unsigned int lnkstat, carrier;

	unsigned long flags;

	unsigned long flags;
@@ -728,7 +728,8 @@ static int am79c961_probe(struct platform_device *pdev) 
	am79c961_banner();

	am79c961_banner();





	spin_lock_init(&priv->chip_lock);

	spin_lock_init(&priv->chip_lock);

	setup_timer(&priv->timer, am79c961_timer, (unsigned long)dev);

	priv->dev = dev;

	timer_setup(&priv->timer, am79c961_timer, 0);





	if (am79c961_hw_init(dev))

	if (am79c961_hw_init(dev))

		goto release;

		goto release;

drivers/net/ethernet/amd/am79c961a.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -140,6 +140,7 @@ struct dev_priv { 
    unsigned long	txhdr;

    unsigned long	txhdr;

    spinlock_t		chip_lock;

    spinlock_t		chip_lock;

    struct timer_list	timer;

    struct timer_list	timer;

    struct net_device   *dev;

};

};





#endif
 
#endif

drivers/net/ethernet/amd/declance.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -260,6 +260,7 @@ struct lance_private { 
	unsigned short busmaster_regval;

	unsigned short busmaster_regval;





	struct timer_list       multicast_timer;

	struct timer_list       multicast_timer;

	struct net_device	*dev;





	/* Pointers to the ring buffers as seen from the CPU */

	/* Pointers to the ring buffers as seen from the CPU */

	char *rx_buf_ptr_cpu[RX_RING_SIZE];

	char *rx_buf_ptr_cpu[RX_RING_SIZE];
@@ -1000,9 +1001,10 @@ static void lance_set_multicast(struct net_device *dev) 
	netif_wake_queue(dev);

	netif_wake_queue(dev);

}

}





static void lance_set_multicast_retry(unsigned long _opaque)

static void lance_set_multicast_retry(struct timer_list *t)

{

{

	struct net_device *dev = (struct net_device *) _opaque;

	struct lance_private *lp = from_timer(lp, t, multicast_timer);

	struct net_device *dev = lp->dev;





	lance_set_multicast(dev);

	lance_set_multicast(dev);

}

}
@@ -1246,8 +1248,8 @@ static int dec_lance_probe(struct device *bdev, const int type) 
	 * can occur from interrupts (ex. IPv6).  So we

	 * can occur from interrupts (ex. IPv6).  So we

	 * use a timer to try again later when necessary. -DaveM

	 * use a timer to try again later when necessary. -DaveM

	 */

	 */

	setup_timer(&lp->multicast_timer, lance_set_multicast_retry,

	lp->dev = dev;

		    (unsigned long)dev);

	timer_setup(&lp->multicast_timer, lance_set_multicast_retry, 0);









	ret = register_netdev(dev);

	ret = register_netdev(dev);

drivers/net/ethernet/amd/pcnet32.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -321,7 +321,7 @@ static struct net_device_stats *pcnet32_get_stats(struct net_device *); 
static void pcnet32_load_multicast(struct net_device *dev);

static void pcnet32_load_multicast(struct net_device *dev);

static void pcnet32_set_multicast_list(struct net_device *);

static void pcnet32_set_multicast_list(struct net_device *);

static int pcnet32_ioctl(struct net_device *, struct ifreq *, int);

static int pcnet32_ioctl(struct net_device *, struct ifreq *, int);

static void pcnet32_watchdog(struct net_device *);

static void pcnet32_watchdog(struct timer_list *);

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);

static void mdio_write(struct net_device *dev, int phy_id, int reg_num,

static void mdio_write(struct net_device *dev, int phy_id, int reg_num,

		       int val);

		       int val);
@@ -1970,8 +1970,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) 
			lp->options |= PCNET32_PORT_MII;

			lp->options |= PCNET32_PORT_MII;

	}

	}





	setup_timer(&lp->watchdog_timer, (void *)&pcnet32_watchdog,

	timer_setup(&lp->watchdog_timer, pcnet32_watchdog, 0);

		    (unsigned long)dev);





	/* The PCNET32-specific entries in the device structure. */

	/* The PCNET32-specific entries in the device structure. */

	dev->netdev_ops = &pcnet32_netdev_ops;

	dev->netdev_ops = &pcnet32_netdev_ops;
@@ -2901,9 +2900,10 @@ static void pcnet32_check_media(struct net_device *dev, int verbose) 
 * Could possibly be changed to use mii_check_media instead.

 * Could possibly be changed to use mii_check_media instead.

 */

 */





static void pcnet32_watchdog(struct net_device *dev)

static void pcnet32_watchdog(struct timer_list *t)

{

{

	struct pcnet32_private *lp = netdev_priv(dev);

	struct pcnet32_private *lp = from_timer(lp, t, watchdog_timer);

	struct net_device *dev = lp->dev;

	unsigned long flags;

	unsigned long flags;





	/* Print the link status if it has changed */

	/* Print the link status if it has changed */