From patchwork Mon Mar 16 15:07:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Mc Guire X-Patchwork-Id: 6021541 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 31EDC9F2A9 for ; Mon, 16 Mar 2015 15:13:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5D75320462 for ; Mon, 16 Mar 2015 15:13:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5752B20426 for ; Mon, 16 Mar 2015 15:13:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934200AbbCPPMh (ORCPT ); Mon, 16 Mar 2015 11:12:37 -0400 Received: from www.osadl.org ([62.245.132.105]:59176 "EHLO www.osadl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932191AbbCPPMf (ORCPT ); Mon, 16 Mar 2015 11:12:35 -0400 Received: from debian.hofrr.at (92-243-35-153.adsl.nanet.at [92.243.35.153] (may be forged)) by www.osadl.org (8.13.8/8.13.8/OSADL-2007092901) with ESMTP id t2GFCEjH010687; Mon, 16 Mar 2015 16:12:14 +0100 From: Nicholas Mc Guire To: QLogic-Storage-Upstream@qlogic.com Cc: "James E.J. Bottomley" , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Nicholas Mc Guire Subject: [PATCH RESEND] scsi: qla4xxx: drop duplicate init_completion Date: Mon, 16 Mar 2015 11:07:58 -0400 Message-Id: <1426518478-7813-1-git-send-email-hofrat@osadl.org> X-Mailer: git-send-email 1.7.10.4 X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org 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 The double call to init_completion(&ha->disable_acb_comp); is unnecessary. Checking drivers/scsi/qla4xxx/ql4_def.h it seems that struct scsi_qla_host only is defining these four struct completions - thus this seems to be a typo only. Thus the duplicate call is simply dropped. Signed-off-by: Nicholas Mc Guire --- Originally posted as http://lkml.org/lkml/2014/12/23/355 Patch was only compile-tested with x86_64_defconfig + CONFIG_SCSI_LOWLEVEL=y, CONFIG_SCSI_QLA_ISCSI=m Patch is against 4.0-rc3 (localversion-next is -next-20150316 drivers/scsi/qla4xxx/ql4_os.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 6d25879..2723bd9 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c @@ -8669,7 +8669,6 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev, mutex_init(&ha->mbox_sem); mutex_init(&ha->chap_sem); init_completion(&ha->mbx_intr_comp); - init_completion(&ha->disable_acb_comp); init_completion(&ha->idc_comp); init_completion(&ha->link_up_comp); init_completion(&ha->disable_acb_comp);