From: Colin King <colin.king@canonical.com>
To: Jack Wang <jinpu.wang@profitbricks.com>,
lindar_liu@usish.com,
"James E . J . Bottomley" <jejb@linux.ibm.com>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
linux-scsi@vger.kernel.org
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] scsi: pm8001: clean up structurally dead code when PM8001_USE_MSIX is defined
Date: Fri, 29 Mar 2019 23:44:22 +0000 [thread overview]
Message-ID: <20190329234423.5611-2-colin.king@canonical.com> (raw)
In-Reply-To: <20190329234423.5611-1-colin.king@canonical.com>
From: Colin Ian King <colin.king@canonical.com>
When macro PM8001_USE_MSIX is defined there is redundant dead code
call to pm8001_cr32. Clean this up for the defined PM8001_USE_MSIX and
undefined PM8001_USE_MSIX cases.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/scsi/pm8001/pm8001_hwi.c | 7 ++++---
drivers/scsi/pm8001/pm80xx_hwi.c | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index e4209091c1da..434498a78946 100644
--- a/drivers/scsi/pm8001/pm8001_hwi.c
+++ b/drivers/scsi/pm8001/pm8001_hwi.c
@@ -4625,15 +4625,16 @@ static int pm8001_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha,
static u32 pm8001_chip_is_our_interupt(struct pm8001_hba_info *pm8001_ha)
{
- u32 value;
#ifdef PM8001_USE_MSIX
return 1;
-#endif
+#else
+ u32 value;
+
value = pm8001_cr32(pm8001_ha, 0, MSGU_ODR);
if (value)
return 1;
return 0;
-
+#endif
}
/**
diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c
index 536d2b4384f8..4a176e60307f 100644
--- a/drivers/scsi/pm8001/pm80xx_hwi.c
+++ b/drivers/scsi/pm8001/pm80xx_hwi.c
@@ -4619,15 +4619,16 @@ static int pm80xx_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha,
static u32 pm80xx_chip_is_our_interupt(struct pm8001_hba_info *pm8001_ha)
{
- u32 value;
#ifdef PM8001_USE_MSIX
return 1;
-#endif
+#else
+ u32 value;
+
value = pm8001_cr32(pm8001_ha, 0, MSGU_ODR);
if (value)
return 1;
return 0;
-
+#endif
}
/**
--
2.20.1
next prev parent reply other threads:[~2019-03-29 23:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-29 23:44 [PATCH 0/2][V2] scsi: pm8001: clean up code and fix spelling mistakes Colin King
2019-03-29 23:44 ` Colin King [this message]
2019-03-31 17:47 ` [PATCH 1/2] scsi: pm8001: clean up structurally dead code when PM8001_USE_MSIX is defined Jinpu Wang
2019-03-29 23:44 ` [PATCH 2/2] scsi: pm8001: fix spelling mistake, interupt -> interrupt Colin King
2019-03-31 17:43 ` Jinpu Wang
2019-04-04 3:14 ` [PATCH 0/2][V2] scsi: pm8001: clean up code and fix spelling mistakes Martin K. Petersen
2019-03-30 11:07 [PATCH 1/2] scsi: pm8001: clean up structurally dead code when PM8001_USE_MSIX is defined Walter Harms
2019-03-31 17:49 ` Jinpu Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190329234423.5611-2-colin.king@canonical.com \
--to=colin.king@canonical.com \
--cc=jejb@linux.ibm.com \
--cc=jinpu.wang@profitbricks.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=lindar_liu@usish.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®