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

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

net: ethernet: apple: 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: "David S. Miller" <davem@davemloft.net>
Cc: Johannes Berg <johannes.berg@intel.com>
Cc: Jarod Wilson <jarod@redhat.com>
Cc: Rob Herring <robh@kernel.org>
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 11286125

drivers/net/ethernet/apple/bmac.c

+5 −7
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static irqreturn_t bmac_misc_intr(int irq, void *dev_id); 
static irqreturn_t bmac_txdma_intr(int irq, void *dev_id);

static irqreturn_t bmac_rxdma_intr(int irq, void *dev_id);

static void bmac_set_timeout(struct net_device *dev);

static void bmac_tx_timeout(unsigned long data);

static void bmac_tx_timeout(struct timer_list *t);

static int bmac_output(struct sk_buff *skb, struct net_device *dev);

static void bmac_start(struct net_device *dev);
@@ -555,8 +555,6 @@ static inline void bmac_set_timeout(struct net_device *dev) 
	if (bp->timeout_active)

		del_timer(&bp->tx_timeout);

	bp->tx_timeout.expires = jiffies + TX_TIMEOUT;

	bp->tx_timeout.function = bmac_tx_timeout;

	bp->tx_timeout.data = (unsigned long) dev;

	add_timer(&bp->tx_timeout);

	bp->timeout_active = 1;

	spin_unlock_irqrestore(&bp->lock, flags);
@@ -1321,7 +1319,7 @@ static int bmac_probe(struct macio_dev *mdev, const struct of_device_id *match) 
	bp->queue = (struct sk_buff_head *)(bp->rx_cmds + N_RX_RING + 1);

	skb_queue_head_init(bp->queue);



	init_timer(&bp->tx_timeout);

	timer_setup(&bp->tx_timeout, bmac_tx_timeout, 0);



	ret = request_irq(dev->irq, bmac_misc_intr, 0, "BMAC-misc", dev);

	if (ret) {
@@ -1471,10 +1469,10 @@ bmac_output(struct sk_buff *skb, struct net_device *dev) 
	return NETDEV_TX_OK;

}



static void bmac_tx_timeout(unsigned long data)

static void bmac_tx_timeout(struct timer_list *t)

{

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

	struct bmac_data *bp = netdev_priv(dev);

	struct bmac_data *bp = from_timer(bp, t, tx_timeout);

	struct net_device *dev = macio_get_drvdata(bp->mdev);

	volatile struct dbdma_regs __iomem *td = bp->tx_dma;

	volatile struct dbdma_regs __iomem *rd = bp->rx_dma;

	volatile struct dbdma_cmd *cp;

drivers/net/ethernet/apple/mace.c

+5 −7
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id); 
static irqreturn_t mace_txdma_intr(int irq, void *dev_id);

static irqreturn_t mace_rxdma_intr(int irq, void *dev_id);

static void mace_set_timeout(struct net_device *dev);

static void mace_tx_timeout(unsigned long data);

static void mace_tx_timeout(struct timer_list *t);

static inline void dbdma_reset(volatile struct dbdma_regs __iomem *dma);

static inline void mace_clean_rings(struct mace_data *mp);

static void __mace_set_address(struct net_device *dev, void *addr);
@@ -196,7 +196,7 @@ static int mace_probe(struct macio_dev *mdev, const struct of_device_id *match) 


	memset((char *) mp->tx_cmds, 0,

	       (NCMDS_TX*N_TX_RING + N_RX_RING + 2) * sizeof(struct dbdma_cmd));

	init_timer(&mp->tx_timeout);

	timer_setup(&mp->tx_timeout, mace_tx_timeout, 0);

	spin_lock_init(&mp->lock);

	mp->timeout_active = 0;
@@ -521,8 +521,6 @@ static inline void mace_set_timeout(struct net_device *dev) 
    if (mp->timeout_active)

	del_timer(&mp->tx_timeout);

    mp->tx_timeout.expires = jiffies + TX_TIMEOUT;

    mp->tx_timeout.function = mace_tx_timeout;

    mp->tx_timeout.data = (unsigned long) dev;

    add_timer(&mp->tx_timeout);

    mp->timeout_active = 1;

}
@@ -801,10 +799,10 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id) 
    return IRQ_HANDLED;

}



static void mace_tx_timeout(unsigned long data)

static void mace_tx_timeout(struct timer_list *t)

{

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

    struct mace_data *mp = netdev_priv(dev);

    struct mace_data *mp = from_timer(mp, t, tx_timeout);

    struct net_device *dev = macio_get_drvdata(mp->mdev);

    volatile struct mace __iomem *mb = mp->mace;

    volatile struct dbdma_regs __iomem *td = mp->tx_dma;

    volatile struct dbdma_regs __iomem *rd = mp->rx_dma;