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

Commit 29e80b7c authored by Jitendra Bhivare's avatar Jitendra Bhivare Committed by Martin K. Petersen
Browse files

scsi: be2iscsi: Remove wq_name from beiscsi_hba 



wq_name is used only to set WQ name when its being allocated.
Remove it from beiscsi_hba structure and define locally.

Signed-off-by: default avatarJitendra Bhivare <jitendra.bhivare@broadcom.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent fa1261c4

drivers/scsi/be2iscsi/be_main.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -5623,11 +5623,12 @@ static void beiscsi_eeh_resume(struct pci_dev *pdev) 
static int beiscsi_dev_probe(struct pci_dev *pcidev,

static int beiscsi_dev_probe(struct pci_dev *pcidev,

			     const struct pci_device_id *id)

			     const struct pci_device_id *id)

{

{

	struct beiscsi_hba *phba = NULL;

	struct hwi_controller *phwi_ctrlr;

	struct hwi_context_memory *phwi_context;

	struct hwi_context_memory *phwi_context;

	struct hwi_controller *phwi_ctrlr;

	struct beiscsi_hba *phba = NULL;

	struct be_eq_obj *pbe_eq;

	struct be_eq_obj *pbe_eq;

	unsigned int s_handle;

	unsigned int s_handle;

	char wq_name[20];

	int ret, i;

	int ret, i;





	ret = beiscsi_enable_pci(pcidev);

	ret = beiscsi_enable_pci(pcidev);
@@ -5739,9 +5740,9 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev, 




	phba->ctrl.mcc_alloc_index = phba->ctrl.mcc_free_index = 0;

	phba->ctrl.mcc_alloc_index = phba->ctrl.mcc_free_index = 0;





	snprintf(phba->wq_name, sizeof(phba->wq_name), "beiscsi_%02x_wq",

	snprintf(wq_name, sizeof(wq_name), "beiscsi_%02x_wq",

		 phba->shost->host_no);

		 phba->shost->host_no);

	phba->wq = alloc_workqueue("%s", WQ_MEM_RECLAIM, 1, phba->wq_name);

	phba->wq = alloc_workqueue("%s", WQ_MEM_RECLAIM, 1, wq_name);

	if (!phba->wq) {

	if (!phba->wq) {

		beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,

		beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,

			    "BM_%d : beiscsi_dev_probe-"

			    "BM_%d : beiscsi_dev_probe-"

drivers/scsi/be2iscsi/be_main.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -410,7 +410,6 @@ struct beiscsi_hba { 
	u8 port_name;

	u8 port_name;

	u8 port_speed;

	u8 port_speed;

	char fw_ver_str[BEISCSI_VER_STRLEN];

	char fw_ver_str[BEISCSI_VER_STRLEN];

	char wq_name[20];

	struct workqueue_struct *wq;	/* The actuak work queue */

	struct workqueue_struct *wq;	/* The actuak work queue */

	struct be_ctrl_info ctrl;

	struct be_ctrl_info ctrl;

	unsigned int generation;

	unsigned int generation;