From: Akinobu Mita <akinobu.mita@gmail.com>
To: linux-block@vger.kernel.org, linux-leds@vger.kernel.org,
linux-scsi@vger.kernel.org
Cc: Akinobu Mita <akinobu.mita@gmail.com>,
Frank Steiner <fsteiner-mail1@bio.ifi.lmu.de>,
Jacek Anaszewski <jacek.anaszewski@gmail.com>,
Pavel Machek <pavel@ucw.cz>, Dan Murphy <dmurphy@ti.com>,
Jens Axboe <axboe@kernel.dk>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
GOTO Masanori <gotom@debian.or.jp>,
YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>
Subject: [PATCH 3/3] scsi: nsp32: rename LED_* macros to EXT_PORT_LED_*
Date: Sun, 28 Jul 2019 23:00:46 +0900 [thread overview]
Message-ID: <1564322446-28255-4-git-send-email-akinobu.mita@gmail.com> (raw)
In-Reply-To: <1564322446-28255-1-git-send-email-akinobu.mita@gmail.com>
The nsp32 driver defines LED_ON and LED_OFF macros for EXT_PORT_DDR or
EXT_PORT register values. The LED_OFF and LED_ON macros conflict with
the LED subsystem's LED_OFF and LED_ON enums.
This renames these LED_* macros to EXT_PORT_LED_* in nsp32 driver.
Cc: Frank Steiner <fsteiner-mail1@bio.ifi.lmu.de>
Cc: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Dan Murphy <dmurphy@ti.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: GOTO Masanori <gotom@debian.or.jp>
Cc: YOKOTA Hiroshi <yokota@netlab.is.tsukuba.ac.jp>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
---
drivers/scsi/nsp32.c | 6 +++---
drivers/scsi/nsp32.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 70db792..330cf4c 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -763,7 +763,7 @@ static int nsp32_arbitration(struct scsi_cmnd *SCpnt, unsigned int base)
if (arbit & ARBIT_WIN) {
/* Arbitration succeeded */
SCpnt->result = DID_OK << 16;
- nsp32_index_write1(base, EXT_PORT, LED_ON); /* PCI LED on */
+ nsp32_index_write1(base, EXT_PORT, EXT_PORT_LED_ON); /* PCI LED on */
} else if (arbit & ARBIT_FAIL) {
/* Arbitration failed */
SCpnt->result = DID_BUS_BUSY << 16;
@@ -1137,8 +1137,8 @@ static int nsp32hw_init(nsp32_hw_data *data)
nsp32_write2(base, IRQ_CONTROL, 0);
/* PCI LED off */
- nsp32_index_write1(base, EXT_PORT_DDR, LED_OFF);
- nsp32_index_write1(base, EXT_PORT, LED_OFF);
+ nsp32_index_write1(base, EXT_PORT_DDR, EXT_PORT_LED_OFF);
+ nsp32_index_write1(base, EXT_PORT, EXT_PORT_LED_OFF);
return TRUE;
}
diff --git a/drivers/scsi/nsp32.h b/drivers/scsi/nsp32.h
index ab0726c..a7553ea 100644
--- a/drivers/scsi/nsp32.h
+++ b/drivers/scsi/nsp32.h
@@ -306,8 +306,8 @@ typedef u16 u16_le;
#define EXT_PORT_DDR 0x02 /* BASE+08, IDX+02, B, R/W */
#define EXT_PORT 0x03 /* BASE+08, IDX+03, B, R/W */
-# define LED_ON (0)
-# define LED_OFF BIT(0)
+# define EXT_PORT_LED_ON (0)
+# define EXT_PORT_LED_OFF BIT(0)
#define IRQ_SELECT 0x04 /* BASE+08, IDX+04, W, R/W */
# define IRQSELECT_RESELECT_IRQ BIT(0)
--
2.7.4
next prev parent reply other threads:[~2019-07-28 14:01 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-28 14:00 [PATCH 0/3] rename LED_OFF and LED_ON to avoid name collision with leds subsystem Akinobu Mita
2019-07-28 14:00 ` [PATCH 1/3] block: umem: rename LED_* macros to LEDCTRL_* Akinobu Mita
2019-07-28 17:30 ` Jacek Anaszewski
2019-07-29 15:21 ` Akinobu Mita
2019-07-29 19:13 ` Pavel Machek
2019-07-29 19:24 ` Jacek Anaszewski
2019-07-29 9:43 ` Hannes Reinecke
2019-07-28 14:00 ` [PATCH 2/3] scsi: mvsas: rename LED_* enums to SGPIO_LED_* Akinobu Mita
2019-07-29 9:43 ` Hannes Reinecke
2019-07-29 11:27 ` Pavel Machek
2019-07-28 14:00 ` Akinobu Mita [this message]
2019-07-29 9:44 ` [PATCH 3/3] scsi: nsp32: rename LED_* macros to EXT_PORT_LED_* Hannes Reinecke
2019-07-29 11:27 ` Pavel Machek
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=1564322446-28255-4-git-send-email-akinobu.mita@gmail.com \
--to=akinobu.mita@gmail.com \
--cc=axboe@kernel.dk \
--cc=dmurphy@ti.com \
--cc=fsteiner-mail1@bio.ifi.lmu.de \
--cc=gotom@debian.or.jp \
--cc=jacek.anaszewski@gmail.com \
--cc=jejb@linux.ibm.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=pavel@ucw.cz \
--cc=yokota@netlab.is.tsukuba.ac.jp \
/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;
as well as URLs for NNTP newsgroup(s).