Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp4090355imm; Mon, 17 Sep 2018 08:04:05 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdbj7g+crfPfQi7jy0LHGrndwR7C9Dy1TBBDwZFC2BB/5PO6uEXaAG9qSKawQhAbYC7phGg0 X-Received: by 2002:a63:3105:: with SMTP id x5-v6mr24433487pgx.323.1537196645529; Mon, 17 Sep 2018 08:04:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537196645; cv=none; d=google.com; s=arc-20160816; b=VzomAlC4QC7mvKwHktomgJQcZdRAqpsa2axRx7ZD7mUZHkKjXzju0F+zFwihuCF1Lz ClfB6yu7DvBS6x9UyrcEVgsPiRZj0ejnQRLM1MD2VzjsmypbdfDn9LkrRsMMJDyqnSh1 P2aCj0pkQLt+gRvG6QjC3TWc56PdnennO6ZBqpvDr8dBcCldwUz4woicole4exq2w6ro GvfdkmA2eWqsRZpZugsJuN+RUMzZhjtElGdOFTFNtc58Pc8ZijZ6yzboQPvAvh1UEnMd /XL07uiSdWSTq8qnsfb+LueNYylPyaQ5ZZDXB4sOBPtwHkjOA54e14JU04rFiTSlhI4o mD8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=cA+zLq4NwvqMZtJ0/9dkj8G38CZ9sX6jB2zvy6ey6w0=; b=rrPN+EdIsnXKSFLolHoz/4TmfVqCIY9Gc00vN5Wk3thnjekt282jJ9AvnWXQ7GaoOI kWSRQ4ZdcwzuwpTJj35QqMeyKp6C6ttc57xeGxy7TMVw7w+l6Zuj0G1UwqpjSF+9PPWp wj8b0/KK7/vWsc7FcyNn56KkmY0drW+xaPLCh+UKj4e854En2nos6yjS7wcqW1SywaFm HFK4CIq7cz+AH2SEn/At9D1FRI+kdfdFMFBB5iWIXdrdngL2BCd4W7nAJ2WX2K5KXoUq mUiW5SRfticaK8DI0S+K6FnPISVEVhKxI9676SqucU2JkFnrjeHuFQ8jCQaIxxsuk0D8 GxxA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p14-v6si15874691pgg.67.2018.09.17.08.03.50; Mon, 17 Sep 2018 08:04:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729279AbeIQU3m (ORCPT + 99 others); Mon, 17 Sep 2018 16:29:42 -0400 Received: from smtprelay0030.hostedemail.com ([216.40.44.30]:34285 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729059AbeIQU3l (ORCPT ); Mon, 17 Sep 2018 16:29:41 -0400 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay03.hostedemail.com (Postfix) with ESMTP id 978BB8368EE8; Mon, 17 Sep 2018 15:01:57 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::::::::,RULES_HIT:41:69:355:379:541:800:960:968:973:988:989:1260:1345:1359:1437:1534:1543:1711:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3353:3865:3866:3867:3868:4321:4419:4605:5007:6248:6261:8957:10004:10848:11026:11473:11658:11914:12043:12294:12555:12679:12683:12895:12986:13161:13229:14093:14110:14181:14394:14721:21080:21433:21451:21627:30029:30054,0,RBL:208.54.39.180:@perches.com:.lbl8.mailshell.net-62.8.0.180 64.201.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:31,LUA_SUMMARY:none X-HE-Tag: books25_4ab8a21571408 X-Filterd-Recvd-Size: 4799 Received: from joe-laptop.perches.com (mb42736d0.tmodns.net [208.54.39.180]) (Authenticated sender: joe@perches.com) by omf13.hostedemail.com (Postfix) with ESMTPA; Mon, 17 Sep 2018 15:01:53 +0000 (UTC) From: Joe Perches To: Sathya Prakash , Chaitra P B , Suganath Prabu Subramani Cc: "James E.J. Bottomley" , "Martin K. Petersen" , MPT-FusionLinux.pdl@broadcom.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/7] mpt3sas: Remove KERN_WARNING from panic uses Date: Mon, 17 Sep 2018 08:01:12 -0700 Message-Id: <36d906ff0d22e530024eb487a3a6dbb224f6a1b0.1537183088.git.joe@perches.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove the logging level as panic calls stop the machine and should always be emitted regardless of requested logging level. These existing panic uses are perhaps inappropriate. Miscellanea: o Coalesce formats and convert MPT3SAS_FMT to "%s: " to improve clarity Signed-off-by: Joe Perches --- drivers/scsi/mpt3sas/mpt3sas_config.c | 41 +++++++++++++---------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/drivers/scsi/mpt3sas/mpt3sas_config.c b/drivers/scsi/mpt3sas/mpt3sas_config.c index 38d3b163b5d1..02209447f4ef 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_config.c +++ b/drivers/scsi/mpt3sas/mpt3sas_config.c @@ -421,12 +421,10 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t (mpi_reply->Header.PageType & 0xF)) { _debug_dump_mf(mpi_request, ioc->request_sz/4); _debug_dump_reply(mpi_reply, ioc->request_sz/4); - panic(KERN_WARNING MPT3SAS_FMT "%s: Firmware BUG:" \ - " mpi_reply mismatch: Requested PageType(0x%02x)" \ - " Reply PageType(0x%02x)\n", \ - ioc->name, __func__, - (mpi_request->Header.PageType & 0xF), - (mpi_reply->Header.PageType & 0xF)); + panic("%s: %s: Firmware BUG: mpi_reply mismatch: Requested PageType(0x%02x) Reply PageType(0x%02x)\n", + ioc->name, __func__, + mpi_request->Header.PageType & 0xF, + mpi_reply->Header.PageType & 0xF); } if (((mpi_request->Header.PageType & 0xF) == @@ -434,11 +432,10 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t mpi_request->ExtPageType != mpi_reply->ExtPageType) { _debug_dump_mf(mpi_request, ioc->request_sz/4); _debug_dump_reply(mpi_reply, ioc->request_sz/4); - panic(KERN_WARNING MPT3SAS_FMT "%s: Firmware BUG:" \ - " mpi_reply mismatch: Requested ExtPageType(0x%02x)" - " Reply ExtPageType(0x%02x)\n", - ioc->name, __func__, mpi_request->ExtPageType, - mpi_reply->ExtPageType); + panic("%s: %s: Firmware BUG: mpi_reply mismatch: Requested ExtPageType(0x%02x) Reply ExtPageType(0x%02x)\n", + ioc->name, __func__, + mpi_request->ExtPageType, + mpi_reply->ExtPageType); } ioc_status = le16_to_cpu(mpi_reply->IOCStatus) & MPI2_IOCSTATUS_MASK; @@ -461,14 +458,10 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t _debug_dump_reply(mpi_reply, ioc->request_sz/4); _debug_dump_config(p, min_t(u16, mem.sz, config_page_sz)/4); - panic(KERN_WARNING MPT3SAS_FMT - "%s: Firmware BUG:" \ - " config page mismatch:" - " Requested PageType(0x%02x)" - " Reply PageType(0x%02x)\n", - ioc->name, __func__, - (mpi_request->Header.PageType & 0xF), - (p[3] & 0xF)); + panic("%s: %s: Firmware BUG: config page mismatch: Requested PageType(0x%02x) Reply PageType(0x%02x)\n", + ioc->name, __func__, + mpi_request->Header.PageType & 0xF, + p[3] & 0xF); } if (((mpi_request->Header.PageType & 0xF) == @@ -478,13 +471,9 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t _debug_dump_reply(mpi_reply, ioc->request_sz/4); _debug_dump_config(p, min_t(u16, mem.sz, config_page_sz)/4); - panic(KERN_WARNING MPT3SAS_FMT - "%s: Firmware BUG:" \ - " config page mismatch:" - " Requested ExtPageType(0x%02x)" - " Reply ExtPageType(0x%02x)\n", - ioc->name, __func__, - mpi_request->ExtPageType, p[6]); + panic("%s: %s: Firmware BUG: config page mismatch: Requested ExtPageType(0x%02x) Reply ExtPageType(0x%02x)\n", + ioc->name, __func__, + mpi_request->ExtPageType, p[6]); } } memcpy(config_page, mem.page, min_t(u16, mem.sz, -- 2.15.0