Commit 506f7f6b authored by Joe Perches's avatar Joe Perches Committed by Martin K. Petersen
Browse files

scsi: mpt3sas: Remove KERN_WARNING from panic uses 



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: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarSuganath Prabu <suganath-prabu.subramani@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent fc7d510e

drivers/scsi/mpt3sas/mpt3sas_config.c

+15 −26
Original line number Diff line number Diff line
@@ -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", \

			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));

			      mpi_request->Header.PageType & 0xF,

			      mpi_reply->Header.PageType & 0xF);

		}



		if (((mpi_request->Header.PageType & 0xF) ==
@@ -434,10 +432,9 @@ _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,

			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)
@@ -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",

				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));

				      mpi_request->Header.PageType & 0xF,

				      p[3] & 0xF);

			}



			if (((mpi_request->Header.PageType & 0xF) ==
@@ -478,11 +471,7 @@ _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",

				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]);

			}

CRA Git | Maintained and supported by SUSTech CRA and CCSE