diff options
| -rw-r--r-- | drivers/scsi/mpi3mr/mpi3mr.h | 2 | ||||
| -rw-r--r-- | drivers/scsi/mpi3mr/mpi3mr_fw.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/scsi/mpi3mr/mpi3mr.h b/drivers/scsi/mpi3mr/mpi3mr.h index 31d68c151b20..82f4ae87d6bc 100644 --- a/drivers/scsi/mpi3mr/mpi3mr.h +++ b/drivers/scsi/mpi3mr/mpi3mr.h @@ -1076,7 +1076,6 @@ struct scmd_priv { * @fwevt_worker_thread: Firmware event worker thread * @fwevt_lock: Firmware event lock * @fwevt_list: Firmware event list - * @watchdog_work_q_name: Fault watchdog worker thread name * @watchdog_work_q: Fault watchdog worker thread * @watchdog_work: Fault watchdog work * @watchdog_lock: Fault watchdog lock @@ -1265,7 +1264,6 @@ struct mpi3mr_ioc { spinlock_t fwevt_lock; struct list_head fwevt_list; - char watchdog_work_q_name[50]; struct workqueue_struct *watchdog_work_q; struct delayed_work watchdog_work; spinlock_t watchdog_lock; diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c index 8fe6e0bf342e..b564fe5980a6 100644 --- a/drivers/scsi/mpi3mr/mpi3mr_fw.c +++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c @@ -2878,11 +2878,8 @@ void mpi3mr_start_watchdog(struct mpi3mr_ioc *mrioc) return; INIT_DELAYED_WORK(&mrioc->watchdog_work, mpi3mr_watchdog_work); - snprintf(mrioc->watchdog_work_q_name, - sizeof(mrioc->watchdog_work_q_name), "watchdog_%s%d", mrioc->name, - mrioc->id); mrioc->watchdog_work_q = alloc_ordered_workqueue( - "%s", WQ_MEM_RECLAIM, mrioc->watchdog_work_q_name); + "watchdog_%s%d", WQ_MEM_RECLAIM, mrioc->name, mrioc->id); if (!mrioc->watchdog_work_q) { ioc_err(mrioc, "%s: failed (line=%d)\n", __func__, __LINE__); return; |