Skip to contentSkip to conversation

IB/qib: Remove empty function

PATCH Applied Leon Romanovsky 3 participants 3 messages Jan 18, 2017 – Jan 24, 2017 1 message not in the archive InfiniBand

lore
Share & tools
lore

Leon Romanovsky

author
#0 lore raw

PATCH 1/1 IB/qib: Remove empty function

Commit f06267104dd9 ("RDMA: Update workqueue usage") removed content of qib_qsfp_deinit(...) and left it empty.

This patch deletes all leftovers of that function.

Signed-off-by Leon Romanovsky <[email protected]>
---
 drivers/infiniband/hw/qib/qib_iba7322.c |  1 -
 drivers/infiniband/hw/qib/qib_qsfp.c    | 10 ----------
 drivers/infiniband/hw/qib/qib_qsfp.h    |  1 -
 3 files changed, 12 deletions(-)
drivers/infiniband/hw/qib/qib_iba7322.c +0 -1
index c4a36160..9cc97bd 100644
@@ -2893,7 +2893,6 @@ static void qib_setup_7322_cleanup(struct qib_devdata *dd)
 			dd->cspec->gpio_mask &= ~mask;
 			qib_write_kreg(dd, kr_gpio_mask, dd->cspec->gpio_mask);
 			spin_unlock_irqrestore(&dd->cspec->gpio_lock, flags);
-			qib_qsfp_deinit(&dd->pport[i].cpspec->qsfp_data);
 		}
 	}
 }
drivers/infiniband/hw/qib/qib_qsfp.c +0 -10
index 4c7c3c8..295d40a 100644
@@ -485,16 +485,6 @@ void qib_qsfp_init(struct qib_qsfp_data *qd,
 	dd->f_gpio_mod(dd, mask, mask, mask);
 }
 
-void qib_qsfp_deinit(struct qib_qsfp_data *qd)
-{
-	/*
-	 * There is nothing to do here for now.  our work is scheduled
-	 * with queue_work(), and flush_workqueue() from remove_one
-	 * will block until all work setup with queue_work()
-	 * completes.
-	 */
-}
-
 int qib_qsfp_dump(struct qib_pportdata *ppd, char *buf, int len)
 {
 	struct qib_qsfp_cache cd;
drivers/infiniband/hw/qib/qib_qsfp.h +0 -1
index 91908f5..ad8dbd6 100644
@@ -186,4 +186,3 @@ extern int qib_refresh_qsfp_cache(struct qib_pportdata *ppd,
 extern int qib_qsfp_mod_present(struct qib_pportdata *ppd);
 extern void qib_qsfp_init(struct qib_qsfp_data *qd,
 			  void (*fevent)(struct work_struct *));
-extern void qib_qsfp_deinit(struct qib_qsfp_data *qd);
Signature · 6 lines
2.10.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 20170118055758.27237-1-leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org

Reviewed-by
#2 lore raw
Quoted 51 lines · Leon Romanovsky

Commit f06267104dd9 ("RDMA: Update workqueue usage") removed content of qib_qsfp_deinit(...) and left it empty.

This patch deletes all leftovers of that function.

Signed-off-by Leon Romanovsky <[email protected]>
---
 drivers/infiniband/hw/qib/qib_iba7322.c |  1 -
 drivers/infiniband/hw/qib/qib_qsfp.c    | 10 ----------
 drivers/infiniband/hw/qib/qib_qsfp.h    |  1 -
 3 files changed, 12 deletions(-)
drivers/infiniband/hw/qib/qib_iba7322.c +0 -1
index c4a36160..9cc97bd 100644
@@ -2893,7 +2893,6 @@ static void qib_setup_7322_cleanup(struct qib_devdata *dd)
 			dd->cspec->gpio_mask &= ~mask;
 			qib_write_kreg(dd, kr_gpio_mask, dd->cspec->gpio_mask);
 			spin_unlock_irqrestore(&dd->cspec->gpio_lock, flags);
-			qib_qsfp_deinit(&dd->pport[i].cpspec->qsfp_data);
 		}
 	}
 }
drivers/infiniband/hw/qib/qib_qsfp.c +0 -10
index 4c7c3c8..295d40a 100644
@@ -485,16 +485,6 @@ void qib_qsfp_init(struct qib_qsfp_data *qd,
 	dd->f_gpio_mod(dd, mask, mask, mask);
 }
 
-void qib_qsfp_deinit(struct qib_qsfp_data *qd)
-{
-	/*
-	 * There is nothing to do here for now.  our work is scheduled
-	 * with queue_work(), and flush_workqueue() from remove_one
-	 * will block until all work setup with queue_work()
-	 * completes.
-	 */
-}
-
 int qib_qsfp_dump(struct qib_pportdata *ppd, char *buf, int len)
 {
 	struct qib_qsfp_cache cd;
drivers/infiniband/hw/qib/qib_qsfp.h +0 -0
index 91908f5..ad8dbd6 100644

drivers/infiniband/hw/qib/qib_qsfp.h extern int qib_refresh_qsfp_cache(struct qib_pportdata *ppd, · line 189

Quoted 4 lines
drivers/infiniband/hw/qib/qib_qsfp.h +0 -1
@@ -186,4 +186,3 @@ extern int qib_refresh_qsfp_cache(struct qib_pportdata *ppd,
 extern int qib_qsfp_mod_present(struct qib_pportdata *ppd);
 extern void qib_qsfp_init(struct qib_qsfp_data *qd,
 			  void (*fevent)(struct work_struct *));
-extern void qib_qsfp_deinit(struct qib_qsfp_data *qd);
Reviewed-by Yuval Shaia <[email protected]>
Quoted 6 lines

2.10.2

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Applied
#3 lore raw
In reply to a message not in the archive
Quoted 6 lines · Leon Romanovsky

Commit f06267104dd9 ("RDMA: Update workqueue usage") removed content of qib_qsfp_deinit(...) and left it empty.

This patch deletes all leftovers of that function.

Signed-off-by Leon Romanovsky <[email protected]>

Thanks, applied to -next area.

Signature · 4 lines
Doug Ledford <[email protected]>
    GPG KeyID: B826A3330E572FDD
   
Key fingerprint = AE6B 1BDA 122B 23B4 265B  1274 B826 A333 0E57 2FDD