From patchwork Mon Dec 5 08:06:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jitendra Bhivare X-Patchwork-Id: 9460589 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A36B76071F for ; Mon, 5 Dec 2016 08:07:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92C6520009 for ; Mon, 5 Dec 2016 08:07:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8594E2026B; Mon, 5 Dec 2016 08:07:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34E3120009 for ; Mon, 5 Dec 2016 08:07:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751439AbcLEIH1 (ORCPT ); Mon, 5 Dec 2016 03:07:27 -0500 Received: from mail-qk0-f178.google.com ([209.85.220.178]:34179 "EHLO mail-qk0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750849AbcLEIH1 (ORCPT ); Mon, 5 Dec 2016 03:07:27 -0500 Received: by mail-qk0-f178.google.com with SMTP id q130so150701445qke.1 for ; Mon, 05 Dec 2016 00:07:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nwmezjsAW7+WkRgRX6g2EYpzakvO7Z37BjfnoJw4jm0=; b=Jt/Z/+6cCTe0zibue/SyXjPlIbe4sYgvaeQn8XddaiygCXEBgCButuYRqTSJW0ZZZ0 /0W9ZRM+NOuo6HoCCMQerGuK+mJAx58YvsFeBhrUfCzOAwXz42fUw0u5vCbHIzU7fvSH TD57lCD3aVACq/v4y0UEeeYFPeGMvqLtcgO6Y= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nwmezjsAW7+WkRgRX6g2EYpzakvO7Z37BjfnoJw4jm0=; b=aixYgtneuhiB6jEtPCzko4jGRkW0Wy5U0VBvSprWGYJGauc1klSoV0P8kWuTx3q7Vz /FgG1ceFQN9nj3w9W80C9PY7y2PBv70sGtyoNNYM9tEb9YKVPxHS4D1WuXmvphvCx1Ll yMQrcutPl/Pg9BKIcQv9EfUDQ31mHx9s+mhQ5RRCL3h3qhkO/L9YjPdv54vlNTVn9cYQ ZiEtYlGIP6CsB9Adq6kCMZhcgB/hmLdIFl9E05C+2gMYuEeq1GnyUOpCKnPVGEr0OrUm hpw+wxiAHXZlXdxmn54DfAOIU08r5aeXZ3qldC4J5LklzHM19yeqggkZWwnCo/rAw4LA VpDQ== X-Gm-Message-State: AKaTC03nOCFfLWkk7cX1WAQ3Mkq2J24/aef0VUnFmRY1eYI+PDBOy4bRJB4qV33JQodybO6k X-Received: by 10.55.133.134 with SMTP id h128mr48259471qkd.190.1480925246060; Mon, 05 Dec 2016 00:07:26 -0800 (PST) Received: from android.dhcp.avagotech.net ([192.19.239.250]) by smtp.gmail.com with ESMTPSA id i19sm8890519qte.8.2016.12.05.00.07.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Dec 2016 00:07:25 -0800 (PST) From: Jitendra Bhivare To: cleech@redhat.com, lduncan@suse.com Cc: linux-scsi@vger.kernel.org, Jitendra Bhivare Subject: [PATCH 09/12] be2iscsi: Remove wq_name from beiscsi_hba Date: Mon, 5 Dec 2016 13:36:48 +0530 Message-Id: <1480925211-13223-10-git-send-email-jitendra.bhivare@broadcom.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1480925211-13223-1-git-send-email-jitendra.bhivare@broadcom.com> References: <1480925211-13223-1-git-send-email-jitendra.bhivare@broadcom.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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: Jitendra Bhivare --- drivers/scsi/be2iscsi/be_main.c | 9 +++++---- drivers/scsi/be2iscsi/be_main.h | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index 723869d..c04080f 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -5619,11 +5619,12 @@ static void beiscsi_eeh_resume(struct pci_dev *pdev) static int beiscsi_dev_probe(struct pci_dev *pcidev, const struct pci_device_id *id) { - struct beiscsi_hba *phba = NULL; - struct hwi_controller *phwi_ctrlr; struct hwi_context_memory *phwi_context; + struct hwi_controller *phwi_ctrlr; + struct beiscsi_hba *phba = NULL; struct be_eq_obj *pbe_eq; unsigned int s_handle; + char wq_name[20]; int ret, i; ret = beiscsi_enable_pci(pcidev); @@ -5735,9 +5736,9 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev, 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->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) { beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT, "BM_%d : beiscsi_dev_probe-" diff --git a/drivers/scsi/be2iscsi/be_main.h b/drivers/scsi/be2iscsi/be_main.h index 73cc2f7..30379de 100644 --- a/drivers/scsi/be2iscsi/be_main.h +++ b/drivers/scsi/be2iscsi/be_main.h @@ -410,7 +410,6 @@ struct beiscsi_hba { u8 port_name; u8 port_speed; char fw_ver_str[BEISCSI_VER_STRLEN]; - char wq_name[20]; struct workqueue_struct *wq; /* The actuak work queue */ struct be_ctrl_info ctrl; unsigned int generation;