From patchwork Tue Dec 13 10:26:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jitendra Bhivare X-Patchwork-Id: 9472033 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 0C1E3607EE for ; Tue, 13 Dec 2016 10:27:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E589D2858E for ; Tue, 13 Dec 2016 10:27:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D9ACC28590; Tue, 13 Dec 2016 10:27:11 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 A96502858E for ; Tue, 13 Dec 2016 10:27:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932469AbcLMK1K (ORCPT ); Tue, 13 Dec 2016 05:27:10 -0500 Received: from mail-qk0-f176.google.com ([209.85.220.176]:34295 "EHLO mail-qk0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932220AbcLMK1J (ORCPT ); Tue, 13 Dec 2016 05:27:09 -0500 Received: by mail-qk0-f176.google.com with SMTP id q130so111374649qke.1 for ; Tue, 13 Dec 2016 02:27:09 -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=uHz1kHugl+ub+A5+PIQdrnJyHd0i6f2WmD/ofzlctWk=; b=RBI5Vnv0Srvk3LM6PNYyUD8kw6AHOJSN9wCmtOHgssF46kPFLN/B+KSp1QEa5HpRtg ow/qEnaJz8mlY+TzjE7UCKCgBjL2oIm6r8rhDqn8HcrOwUND1HVo5ndSTUQreC460r3v LyKF8p8wEUSYyQPRk31eMvyqSS5cWRiS6qeno= 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=uHz1kHugl+ub+A5+PIQdrnJyHd0i6f2WmD/ofzlctWk=; b=We4agjb/O/aaDAs3tn0Mgnr+VY8Z0FRmt9svqqutyfO6Adoo9rwmZK2/4FTg7+BtGK 8IpW/8bzEhnkzF6xdQuRA2U8Evt5kju8XZlrkQLETIA4tTer0JrGZjt38Ln7MKNSLExP shMWlB6DVwvNxGrdXMbZpTc0M6k/Qr7PMMEo+eYqIXhTe7zYlTtaNNXhM7SSSwNT5cwE AF3k7NdC6vue6XeJs6HBnRSPTuNC1o/E3bgJjWFq8Aj5n++Kl+pnTfh8vEWw32gmr4jH tpoUWMRwZ9PQTya+Us1xpLVQNR1ACxOs5n5i9xGlz0MC9RGYeVuh85V/+AhCetMjmIgp 3q4Q== X-Gm-Message-State: AKaTC0280CzNOvJydWlgx9F/3UwDKHBrkBltn8ZgIBiPYAKiZkMQDI3ZP30NZto0yCcQTfke X-Received: by 10.55.73.148 with SMTP id w142mr92817631qka.284.1481624828460; Tue, 13 Dec 2016 02:27:08 -0800 (PST) Received: from android.dhcp.avagotech.net ([192.19.239.250]) by smtp.gmail.com with ESMTPSA id t124sm28606864qke.3.2016.12.13.02.27.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Dec 2016 02:27:08 -0800 (PST) From: Jitendra Bhivare To: cleech@redhat.com, lduncan@suse.com Cc: linux-scsi@vger.kernel.org, Jitendra Bhivare Subject: [PATCH v2 09/13] be2iscsi: Remove wq_name from beiscsi_hba Date: Tue, 13 Dec 2016 15:56:02 +0530 Message-Id: <1481624766-13846-10-git-send-email-jitendra.bhivare@broadcom.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481624766-13846-1-git-send-email-jitendra.bhivare@broadcom.com> References: <1481624766-13846-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 Reviewed-by: Hannes Reinecke --- 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 a8e67c6..a68f1be 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -5623,11 +5623,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); @@ -5739,9 +5740,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;