Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp1376936pxu; Mon, 23 Nov 2020 20:56:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJzPKdlq7ux5xVAvUlb+cllKO2rTTXcyARiFefHWCkwZpzoAIEnBsjwnskr5+OUID0blb24v X-Received: by 2002:a17:906:7f10:: with SMTP id d16mr2590117ejr.104.1606193804243; Mon, 23 Nov 2020 20:56:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606193804; cv=none; d=google.com; s=arc-20160816; b=Et9Du+tP6JrKI1q2A1ck5XKOonmwRljd2IlQpb8rdUfAlhLJd1AdVA72BXsu/jwPq3 3dksGSJ9t4Q+EQLW58WVT5sGbC13fhdbaj0uoX04ly7Ubs5AMlPKqeSH4jVI5LmSoMhu VdYG0UKMIYLUNeMsZ1basA8Xk7+FncQrugRwuyEhgBBcyLntbqNyrZ2t+CHYxrGSFq7x xPF/WIRjMhx9lgK2wLYZHRGrAI4Ty0XrQbRCnQp/fPWMCEgFQur57svoBsubBYlnyPJE EEwIIVhpr1ypDEVNx8T+BJjAEoM34lMOgDIncPk1aDvRUjX6HO9q3rP6MySqbNLF5pCp tlrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=0nPRL3pvXZKyYPaKB9wBe3ejWcgnCcWW0Z0NS8E5s9M=; b=mBERa9Yoe3h7zDKQmiTomq5rC/qucBvx+RHkmd/QJjwA9gmoo9xyosSSedR0+YHAPY w9w0MsB0KzNx3J68XZg8rzqLoPPtE3SjfmGfgztMyFvlUleNgkG0us5OMVXvmfMKeHL+ V5n3lVjMrHtCDk9E3Onf619pxHsagh1aw/oz8B4igNHtBwTYZVB+4ulSGCarTxusBPcr Jsgf4R+mmxMzMKT6+pb7tnhlz3/djgmx/+vdzd8sUxPVRvnzjdjEuP2dC+cygHaxRIUS Ui2LQX+GwSHVlGzFYg41drLSHrZ+jDIYwGIQeMfNvrCu5nksRw4+kuOI11IKf0UJuwp7 oiqw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z8si7616254ejr.523.2020.11.23.20.56.21; Mon, 23 Nov 2020 20:56:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729085AbgKXEgL (ORCPT + 99 others); Mon, 23 Nov 2020 23:36:11 -0500 Received: from smtprelay0010.hostedemail.com ([216.40.44.10]:59174 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726039AbgKXEgK (ORCPT ); Mon, 23 Nov 2020 23:36:10 -0500 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay04.hostedemail.com (Postfix) with ESMTP id C7448180A7FD1; Tue, 24 Nov 2020 04:36:09 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1359:1437:1515:1534:1543:1711:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3353:3865:4321:4605:5007:6261:10004:10394:10848:11026:11473:11658:11914:12043:12296:12297:12438:12555:12895:12986:13095:13894:14181:14394:14721:21080:21433:21451:21627:21789:21990:30029:30045:30054,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:0,LUA_SUMMARY:none X-HE-Tag: silk95_52127e92736b X-Filterd-Recvd-Size: 4437 Received: from joe-laptop.perches.com (unknown [47.151.128.180]) (Authenticated sender: joe@perches.com) by omf12.hostedemail.com (Postfix) with ESMTPA; Tue, 24 Nov 2020 04:36:08 +0000 (UTC) From: Joe Perches To: Jack Wang Cc: "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] scsi: pm8001: Convert pm8001_printk to pm8001_info Date: Mon, 23 Nov 2020 20:36:03 -0800 Message-Id: <69dc34ff63adfa60b3f203ed2d58143b5692af57.1606192458.git.joe@perches.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the more common logging style. Signed-off-by: Joe Perches --- drivers/scsi/pm8001/pm8001_init.c | 12 ++++++------ drivers/scsi/pm8001/pm8001_sas.c | 4 ++-- drivers/scsi/pm8001/pm8001_sas.h | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index 13530d7fb8a6..38907f45c845 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c @@ -1293,8 +1293,8 @@ static int pm8001_pci_suspend(struct pci_dev *pdev, pm_message_t state) tasklet_kill(&pm8001_ha->tasklet[j]); #endif device_state = pci_choose_state(pdev, state); - pm8001_printk(pm8001_ha, "pdev=0x%p, slot=%s, entering operating state [D%d]\n", - pdev, pm8001_ha->name, device_state); + pm8001_info(pm8001_ha, "pdev=0x%p, slot=%s, entering operating state [D%d]\n", + pdev, pm8001_ha->name, device_state); pci_save_state(pdev); pci_disable_device(pdev); pci_set_power_state(pdev, device_state); @@ -1318,16 +1318,16 @@ static int pm8001_pci_resume(struct pci_dev *pdev) pm8001_ha = sha->lldd_ha; device_state = pdev->current_state; - pm8001_printk(pm8001_ha, "pdev=0x%p, slot=%s, resuming from previous operating state [D%d]\n", - pdev, pm8001_ha->name, device_state); + pm8001_info(pm8001_ha, "pdev=0x%p, slot=%s, resuming from previous operating state [D%d]\n", + pdev, pm8001_ha->name, device_state); pci_set_power_state(pdev, PCI_D0); pci_enable_wake(pdev, PCI_D0, 0); pci_restore_state(pdev); rc = pci_enable_device(pdev); if (rc) { - pm8001_printk(pm8001_ha, "slot=%s Enable device failed during resume\n", - pm8001_ha->name); + pm8001_info(pm8001_ha, "slot=%s Enable device failed during resume\n", + pm8001_ha->name); goto err_out_enable; } diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c index 4562b0a5062a..d1e9dba2ef19 100644 --- a/drivers/scsi/pm8001/pm8001_sas.c +++ b/drivers/scsi/pm8001/pm8001_sas.c @@ -1191,7 +1191,7 @@ int pm8001_abort_task(struct sas_task *task) phy_id = pm8001_dev->attached_phy; ret = pm8001_find_tag(task, &tag); if (ret == 0) { - pm8001_printk(pm8001_ha, "no tag for task:%p\n", task); + pm8001_info(pm8001_ha, "no tag for task:%p\n", task); return TMF_RESP_FUNC_FAILED; } spin_lock_irqsave(&task->task_state_lock, flags); @@ -1313,7 +1313,7 @@ int pm8001_abort_task(struct sas_task *task) task->slow_task = NULL; spin_unlock_irqrestore(&task->task_state_lock, flags); if (rc != TMF_RESP_FUNC_COMPLETE) - pm8001_printk(pm8001_ha, "rc= %d\n", rc); + pm8001_info(pm8001_ha, "rc= %d\n", rc); return rc; } diff --git a/drivers/scsi/pm8001/pm8001_sas.h b/drivers/scsi/pm8001/pm8001_sas.h index 5266756a268b..f2c8cbad3853 100644 --- a/drivers/scsi/pm8001/pm8001_sas.h +++ b/drivers/scsi/pm8001/pm8001_sas.h @@ -70,14 +70,14 @@ #define PM8001_DEVIO_LOGGING 0x100 /* development io message logging */ #define PM8001_IOERR_LOGGING 0x200 /* development io err message logging */ -#define pm8001_printk(HBA, fmt, ...) \ +#define pm8001_info(HBA, fmt, ...) \ pr_info("%s:: %s %d:" fmt, \ (HBA)->name, __func__, __LINE__, ##__VA_ARGS__) #define pm8001_dbg(HBA, level, fmt, ...) \ do { \ if (unlikely((HBA)->logging_level & PM8001_##level##_LOGGING)) \ - pm8001_printk(HBA, fmt, ##__VA_ARGS__); \ + pm8001_info(HBA, fmt, ##__VA_ARGS__); \ } while (0) #define PM8001_USE_TASKLET -- 2.26.0