From: Akinobu Mita <akinobu.mita@gmail.com>
To: linux-block@vger.kernel.org, linux-leds@vger.kernel.org,
linux-nvme@lists.infradead.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>,
Hannes Reinecke <hare@suse.com>
Subject: [PATCH v4 2/5] scsi: mvsas: rename LED_* enums to SGPIO_LED_*
Date: Fri, 16 Aug 2019 01:59:56 +0900 [thread overview]
Message-ID: <1565888399-21550-3-git-send-email-akinobu.mita@gmail.com> (raw)
In-Reply-To: <1565888399-21550-1-git-send-email-akinobu.mita@gmail.com>
The mvsas driver declares LED_* enums for enum sgpio_led_status. The
LED_OFF and LED_ON enums cause redeclaration of enumerator with the
LED subsystem's LED_OFF and LED_ON enums.
This adds 'SGPIO_' prefix to these enums in mvsas 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: Hannes Reinecke <hare@suse.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
---
drivers/scsi/mvsas/mv_94xx.c | 2 +-
drivers/scsi/mvsas/mv_94xx.h | 24 ++++++++++++------------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/scsi/mvsas/mv_94xx.c b/drivers/scsi/mvsas/mv_94xx.c
index fc0b8eb..3558a625 100644
--- a/drivers/scsi/mvsas/mv_94xx.c
+++ b/drivers/scsi/mvsas/mv_94xx.c
@@ -1085,7 +1085,7 @@ static int mvs_94xx_gpio_write(struct mvs_prv_info *mvs_prv,
block &= ~((0x7 << MVS_SGPIO_DCTRL_ACT_SHIFT)
<< driveshift);
/* hardwire activity bit to SOF */
- block |= LED_BLINKA_SOF << (
+ block |= SGPIO_LED_BLINKA_SOF << (
MVS_SGPIO_DCTRL_ACT_SHIFT +
driveshift);
break;
diff --git a/drivers/scsi/mvsas/mv_94xx.h b/drivers/scsi/mvsas/mv_94xx.h
index a243182..2c96ff1 100644
--- a/drivers/scsi/mvsas/mv_94xx.h
+++ b/drivers/scsi/mvsas/mv_94xx.h
@@ -275,23 +275,23 @@ enum sgpio_registers {
};
enum sgpio_led_status {
- LED_OFF = 0,
- LED_ON = 1,
- LED_BLINKA = 2,
- LED_BLINKA_INV = 3,
- LED_BLINKA_SOF = 4,
- LED_BLINKA_EOF = 5,
- LED_BLINKB = 6,
- LED_BLINKB_INV = 7,
+ SGPIO_LED_OFF = 0,
+ SGPIO_LED_ON = 1,
+ SGPIO_LED_BLINKA = 2,
+ SGPIO_LED_BLINKA_INV = 3,
+ SGPIO_LED_BLINKA_SOF = 4,
+ SGPIO_LED_BLINKA_EOF = 5,
+ SGPIO_LED_BLINKB = 6,
+ SGPIO_LED_BLINKB_INV = 7,
};
-#define DEFAULT_SGPIO_BITS ((LED_BLINKA_SOF << \
+#define DEFAULT_SGPIO_BITS ((SGPIO_LED_BLINKA_SOF << \
MVS_SGPIO_DCTRL_ACT_SHIFT) << (8 * 3) | \
- (LED_BLINKA_SOF << \
+ (SGPIO_LED_BLINKA_SOF << \
MVS_SGPIO_DCTRL_ACT_SHIFT) << (8 * 2) | \
- (LED_BLINKA_SOF << \
+ (SGPIO_LED_BLINKA_SOF << \
MVS_SGPIO_DCTRL_ACT_SHIFT) << (8 * 1) | \
- (LED_BLINKA_SOF << \
+ (SGPIO_LED_BLINKA_SOF << \
MVS_SGPIO_DCTRL_ACT_SHIFT) << (8 * 0))
/*
--
2.7.4
next prev parent reply other threads:[~2019-08-15 17:00 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-15 16:59 [PATCH v4 0/5] introduce LED block device activity trigger Akinobu Mita
2019-08-15 16:59 ` [PATCH v4 1/5] block: umem: rename LED_* macros to MEMCTRL_LED_* Akinobu Mita
2019-08-15 16:59 ` Akinobu Mita [this message]
2019-08-15 16:59 ` [PATCH v4 3/5] scsi: nsp32: rename LED_* macros to EXT_PORT_LED_* Akinobu Mita
2019-08-15 16:59 ` [PATCH v4 4/5] block: introduce LED block device activity trigger Akinobu Mita
2019-08-17 14:55 ` Pavel Machek
2019-08-17 20:07 ` Jacek Anaszewski
2019-08-19 14:38 ` Pavel Machek
2019-08-19 18:22 ` Jacek Anaszewski
2019-08-19 18:37 ` Jacek Anaszewski
2019-08-23 16:00 ` Akinobu Mita
2019-08-24 15:53 ` Jacek Anaszewski
2019-08-27 14:03 ` Akinobu Mita
2019-08-27 21:23 ` Jacek Anaszewski
2019-08-28 14:56 ` Akinobu Mita
2019-08-15 16:59 ` [PATCH v4 5/5] scsi: sd: stop polling disk stats by ledtrig-blk during runtime suspend Akinobu Mita
2019-08-16 19:52 ` Jacek Anaszewski
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=1565888399-21550-3-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=hare@suse.com \
--cc=jacek.anaszewski@gmail.com \
--cc=jejb@linux.ibm.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=pavel@ucw.cz \
/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).