Commit 26cdb8f7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ethernet-convert-tasklets-to-use-new-tasklet_setup-API' 



Allen Pais says:

====================
ethernet: convert tasklets to use new tasklet_setup API

Commit 12cc923f ("tasklet: Introduce new initialization API")'
introduced a new tasklet initialization API. This series converts
all the crypto modules to use the new tasklet_setup() API

This series is based on v5.9-rc5

v3:
  fix subject prefix
  use backpointer instead of fragile priv to netdev.

v2:
  fix kdoc reported by Jakub Kicinski.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e059c6f3 7961fb10

drivers/net/ethernet/alteon/acenic.c

+5 −4
Original line number Diff line number Diff line
@@ -465,6 +465,7 @@ static int acenic_probe_one(struct pci_dev *pdev, 
	SET_NETDEV_DEV(dev, &pdev->dev);



	ap = netdev_priv(dev);

	ap->ndev = dev;

	ap->pdev = pdev;

	ap->name = pci_name(pdev);
@@ -1562,10 +1563,10 @@ static void ace_watchdog(struct net_device *data, unsigned int txqueue) 
}





static void ace_tasklet(unsigned long arg)

static void ace_tasklet(struct tasklet_struct *t)

{

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

	struct ace_private *ap = netdev_priv(dev);

	struct ace_private *ap = from_tasklet(ap, t, ace_tasklet);

	struct net_device *dev = ap->ndev;

	int cur_size;



	cur_size = atomic_read(&ap->cur_rx_bufs);
@@ -2269,7 +2270,7 @@ static int ace_open(struct net_device *dev) 
	/*

	 * Setup the bottom half rx ring refill handler

	 */

	tasklet_init(&ap->ace_tasklet, ace_tasklet, (unsigned long)dev);

	tasklet_setup(&ap->ace_tasklet, ace_tasklet);

	return 0;

}

drivers/net/ethernet/alteon/acenic.h

+2 −1
Original line number Diff line number Diff line
@@ -633,6 +633,7 @@ struct ace_skb 
 */

struct ace_private

{

	struct net_device	*ndev;		/* backpointer */

	struct ace_info		*info;

	struct ace_regs	__iomem	*regs;		/* register base */

	struct ace_skb		*skb;
@@ -776,7 +777,7 @@ static int ace_open(struct net_device *dev); 
static netdev_tx_t ace_start_xmit(struct sk_buff *skb,

				  struct net_device *dev);

static int ace_close(struct net_device *dev);

static void ace_tasklet(unsigned long dev);

static void ace_tasklet(struct tasklet_struct *t);

static void ace_dump_trace(struct ace_private *ap);

static void ace_set_multicast_list(struct net_device *dev);

static int ace_change_mtu(struct net_device *dev, int new_mtu);

drivers/net/ethernet/amd/xgbe/xgbe-drv.c

+9 −10
Original line number Diff line number Diff line
@@ -403,9 +403,9 @@ static bool xgbe_ecc_ded(struct xgbe_prv_data *pdata, unsigned long *period, 
	return false;

}



static void xgbe_ecc_isr_task(unsigned long data)

static void xgbe_ecc_isr_task(struct tasklet_struct *t)

{

	struct xgbe_prv_data *pdata = (struct xgbe_prv_data *)data;

	struct xgbe_prv_data *pdata = from_tasklet(pdata, t, tasklet_ecc);

	unsigned int ecc_isr;

	bool stop = false;
@@ -468,14 +468,14 @@ static irqreturn_t xgbe_ecc_isr(int irq, void *data) 
	if (pdata->isr_as_tasklet)

		tasklet_schedule(&pdata->tasklet_ecc);

	else

		xgbe_ecc_isr_task((unsigned long)pdata);

		xgbe_ecc_isr_task(&pdata->tasklet_ecc);



	return IRQ_HANDLED;

}



static void xgbe_isr_task(unsigned long data)

static void xgbe_isr_task(struct tasklet_struct *t)

{

	struct xgbe_prv_data *pdata = (struct xgbe_prv_data *)data;

	struct xgbe_prv_data *pdata = from_tasklet(pdata, t, tasklet_dev);

	struct xgbe_hw_if *hw_if = &pdata->hw_if;

	struct xgbe_channel *channel;

	unsigned int dma_isr, dma_ch_isr;
@@ -582,7 +582,7 @@ isr_done: 


	/* If there is not a separate ECC irq, handle it here */

	if (pdata->vdata->ecc_support && (pdata->dev_irq == pdata->ecc_irq))

		xgbe_ecc_isr_task((unsigned long)pdata);

		xgbe_ecc_isr_task(&pdata->tasklet_ecc);



	/* If there is not a separate I2C irq, handle it here */

	if (pdata->vdata->i2c_support && (pdata->dev_irq == pdata->i2c_irq))
@@ -607,7 +607,7 @@ static irqreturn_t xgbe_isr(int irq, void *data) 
	if (pdata->isr_as_tasklet)

		tasklet_schedule(&pdata->tasklet_dev);

	else

		xgbe_isr_task((unsigned long)pdata);

		xgbe_isr_task(&pdata->tasklet_dev);



	return IRQ_HANDLED;

}
@@ -991,9 +991,8 @@ static int xgbe_request_irqs(struct xgbe_prv_data *pdata) 
	unsigned int i;

	int ret;



	tasklet_init(&pdata->tasklet_dev, xgbe_isr_task, (unsigned long)pdata);

	tasklet_init(&pdata->tasklet_ecc, xgbe_ecc_isr_task,

		     (unsigned long)pdata);

	tasklet_setup(&pdata->tasklet_dev, xgbe_isr_task);

	tasklet_setup(&pdata->tasklet_ecc, xgbe_ecc_isr_task);



	ret = devm_request_irq(pdata->dev, pdata->dev_irq, xgbe_isr, 0,

			       netdev_name(netdev), pdata);

drivers/net/ethernet/amd/xgbe/xgbe-i2c.c

+5 −6
Original line number Diff line number Diff line
@@ -274,9 +274,9 @@ static void xgbe_i2c_clear_isr_interrupts(struct xgbe_prv_data *pdata, 
		XI2C_IOREAD(pdata, IC_CLR_STOP_DET);

}



static void xgbe_i2c_isr_task(unsigned long data)

static void xgbe_i2c_isr_task(struct tasklet_struct *t)

{

	struct xgbe_prv_data *pdata = (struct xgbe_prv_data *)data;

	struct xgbe_prv_data *pdata = from_tasklet(pdata, t, tasklet_i2c);

	struct xgbe_i2c_op_state *state = &pdata->i2c.op_state;

	unsigned int isr;
@@ -324,7 +324,7 @@ static irqreturn_t xgbe_i2c_isr(int irq, void *data) 
	if (pdata->isr_as_tasklet)

		tasklet_schedule(&pdata->tasklet_i2c);

	else

		xgbe_i2c_isr_task((unsigned long)pdata);

		xgbe_i2c_isr_task(&pdata->tasklet_i2c);



	return IRQ_HANDLED;

}
@@ -369,7 +369,7 @@ static void xgbe_i2c_set_target(struct xgbe_prv_data *pdata, unsigned int addr) 


static irqreturn_t xgbe_i2c_combined_isr(struct xgbe_prv_data *pdata)

{

	xgbe_i2c_isr_task((unsigned long)pdata);

	xgbe_i2c_isr_task(&pdata->tasklet_i2c);



	return IRQ_HANDLED;

}
@@ -462,8 +462,7 @@ static int xgbe_i2c_start(struct xgbe_prv_data *pdata) 


	/* If we have a separate I2C irq, enable it */

	if (pdata->dev_irq != pdata->i2c_irq) {

		tasklet_init(&pdata->tasklet_i2c, xgbe_i2c_isr_task,

			     (unsigned long)pdata);

		tasklet_setup(&pdata->tasklet_i2c, xgbe_i2c_isr_task);



		ret = devm_request_irq(pdata->dev, pdata->i2c_irq,

				       xgbe_i2c_isr, 0, pdata->i2c_name,

drivers/net/ethernet/amd/xgbe/xgbe-mdio.c

+5 −6
Original line number Diff line number Diff line
@@ -688,9 +688,9 @@ static void xgbe_an73_isr(struct xgbe_prv_data *pdata) 
	}

}



static void xgbe_an_isr_task(unsigned long data)

static void xgbe_an_isr_task(struct tasklet_struct *t)

{

	struct xgbe_prv_data *pdata = (struct xgbe_prv_data *)data;

	struct xgbe_prv_data *pdata = from_tasklet(pdata, t, tasklet_an);



	netif_dbg(pdata, intr, pdata->netdev, "AN interrupt received\n");
@@ -715,14 +715,14 @@ static irqreturn_t xgbe_an_isr(int irq, void *data) 
	if (pdata->isr_as_tasklet)

		tasklet_schedule(&pdata->tasklet_an);

	else

		xgbe_an_isr_task((unsigned long)pdata);

		xgbe_an_isr_task(&pdata->tasklet_an);



	return IRQ_HANDLED;

}



static irqreturn_t xgbe_an_combined_isr(struct xgbe_prv_data *pdata)

{

	xgbe_an_isr_task((unsigned long)pdata);

	xgbe_an_isr_task(&pdata->tasklet_an);



	return IRQ_HANDLED;

}
@@ -1414,8 +1414,7 @@ static int xgbe_phy_start(struct xgbe_prv_data *pdata) 


	/* If we have a separate AN irq, enable it */

	if (pdata->dev_irq != pdata->an_irq) {

		tasklet_init(&pdata->tasklet_an, xgbe_an_isr_task,

			     (unsigned long)pdata);

		tasklet_setup(&pdata->tasklet_an, xgbe_an_isr_task);



		ret = devm_request_irq(pdata->dev, pdata->an_irq,

				       xgbe_an_isr, 0, pdata->an_name,

CRA Git | Maintained and supported by SUSTech CRA and CCSE