Commit fcb8e3a3 authored by Allen Pais's avatar Allen Pais Committed by Jakub Kicinski

net: smc: convert tasklets to use new tasklet_setup() API

In preparation for unconditionally passing the
struct tasklet_struct pointer to all tasklet
callbacks, switch to using the new tasklet_setup()
and from_tasklet() to pass the tasklet pointer explicitly.
Signed-off-by: default avatarRomain Perier <romain.perier@gmail.com>
Signed-off-by: default avatarAllen Pais <apais@linux.microsoft.com>
Acked-by: default avatarKarsten Graul <kgraul@linux.ibm.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6e1978a9
...@@ -389,9 +389,9 @@ static void smc_cdc_msg_recv(struct smc_sock *smc, struct smc_cdc_msg *cdc) ...@@ -389,9 +389,9 @@ static void smc_cdc_msg_recv(struct smc_sock *smc, struct smc_cdc_msg *cdc)
* Context: * Context:
* - tasklet context * - tasklet context
*/ */
static void smcd_cdc_rx_tsklet(unsigned long data) static void smcd_cdc_rx_tsklet(struct tasklet_struct *t)
{ {
struct smc_connection *conn = (struct smc_connection *)data; struct smc_connection *conn = from_tasklet(conn, t, rx_tsklet);
struct smcd_cdc_msg *data_cdc; struct smcd_cdc_msg *data_cdc;
struct smcd_cdc_msg cdc; struct smcd_cdc_msg cdc;
struct smc_sock *smc; struct smc_sock *smc;
...@@ -411,7 +411,7 @@ static void smcd_cdc_rx_tsklet(unsigned long data) ...@@ -411,7 +411,7 @@ static void smcd_cdc_rx_tsklet(unsigned long data)
*/ */
void smcd_cdc_rx_init(struct smc_connection *conn) void smcd_cdc_rx_init(struct smc_connection *conn)
{ {
tasklet_init(&conn->rx_tsklet, smcd_cdc_rx_tsklet, (unsigned long)conn); tasklet_setup(&conn->rx_tsklet, smcd_cdc_rx_tsklet);
} }
/***************************** init, exit, misc ******************************/ /***************************** init, exit, misc ******************************/
......
...@@ -131,9 +131,9 @@ static inline void smc_wr_tx_process_cqe(struct ib_wc *wc) ...@@ -131,9 +131,9 @@ static inline void smc_wr_tx_process_cqe(struct ib_wc *wc)
wake_up(&link->wr_tx_wait); wake_up(&link->wr_tx_wait);
} }
static void smc_wr_tx_tasklet_fn(unsigned long data) static void smc_wr_tx_tasklet_fn(struct tasklet_struct *t)
{ {
struct smc_ib_device *dev = (struct smc_ib_device *)data; struct smc_ib_device *dev = from_tasklet(dev, t, send_tasklet);
struct ib_wc wc[SMC_WR_MAX_POLL_CQE]; struct ib_wc wc[SMC_WR_MAX_POLL_CQE];
int i = 0, rc; int i = 0, rc;
int polled = 0; int polled = 0;
...@@ -435,9 +435,9 @@ static inline void smc_wr_rx_process_cqes(struct ib_wc wc[], int num) ...@@ -435,9 +435,9 @@ static inline void smc_wr_rx_process_cqes(struct ib_wc wc[], int num)
} }
} }
static void smc_wr_rx_tasklet_fn(unsigned long data) static void smc_wr_rx_tasklet_fn(struct tasklet_struct *t)
{ {
struct smc_ib_device *dev = (struct smc_ib_device *)data; struct smc_ib_device *dev = from_tasklet(dev, t, recv_tasklet);
struct ib_wc wc[SMC_WR_MAX_POLL_CQE]; struct ib_wc wc[SMC_WR_MAX_POLL_CQE];
int polled = 0; int polled = 0;
int rc; int rc;
...@@ -698,10 +698,8 @@ void smc_wr_remove_dev(struct smc_ib_device *smcibdev) ...@@ -698,10 +698,8 @@ void smc_wr_remove_dev(struct smc_ib_device *smcibdev)
void smc_wr_add_dev(struct smc_ib_device *smcibdev) void smc_wr_add_dev(struct smc_ib_device *smcibdev)
{ {
tasklet_init(&smcibdev->recv_tasklet, smc_wr_rx_tasklet_fn, tasklet_setup(&smcibdev->recv_tasklet, smc_wr_rx_tasklet_fn);
(unsigned long)smcibdev); tasklet_setup(&smcibdev->send_tasklet, smc_wr_tx_tasklet_fn);
tasklet_init(&smcibdev->send_tasklet, smc_wr_tx_tasklet_fn,
(unsigned long)smcibdev);
} }
int smc_wr_create_link(struct smc_link *lnk) int smc_wr_create_link(struct smc_link *lnk)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment