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 v3 1/6] block: umem: rename LED_* macros to MEMCTRL_LED_*
Date: Sun, 11 Aug 2019 02:54:58 +0900 [thread overview]
Message-ID: <1565459703-30513-2-git-send-email-akinobu.mita@gmail.com> (raw)
In-Reply-To: <1565459703-30513-1-git-send-email-akinobu.mita@gmail.com>
The umem driver defines LED_* macros for MEMCTRLCMD_LEDCTRL 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 MEMCTRL_LED_* in umem 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>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
---
drivers/block/umem.c | 20 ++++++++++----------
drivers/block/umem.h | 20 ++++++++++----------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 1f3f9e0..1109308 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -167,14 +167,14 @@ static int set_userbit(struct cardinfo *card, int bit, unsigned char state)
}
/*
- * NOTE: For the power LED, use the LED_POWER_* macros since they differ
+ * NOTE: For the power LED, use the MEMCTRL_LED_POWER_* macros since they differ
*/
static void set_led(struct cardinfo *card, int shift, unsigned char state)
{
unsigned char led;
led = readb(card->csr_remap + MEMCTRLCMD_LEDCTRL);
- if (state == LED_FLIP)
+ if (state == MEMCTRL_LED_FLIP)
led ^= (1<<shift);
else {
led &= ~(0x03 << shift);
@@ -268,7 +268,7 @@ static void mm_start_io(struct cardinfo *card)
if (debug & DEBUG_LED_ON_TRANSFER)
- set_led(card, LED_REMOVE, LED_ON);
+ set_led(card, MEMCTRL_LED_REMOVE, MEMCTRL_LED_ON);
desc = &page->desc[page->headcnt];
writel(0, card->csr_remap + DMA_PCI_ADDR);
@@ -477,7 +477,7 @@ static void process_page(unsigned long data)
}
if (debug & DEBUG_LED_ON_TRANSFER)
- set_led(card, LED_REMOVE, LED_OFF);
+ set_led(card, MEMCTRL_LED_REMOVE, MEMCTRL_LED_OFF);
if (card->check_batteries) {
card->check_batteries = 0;
@@ -652,13 +652,13 @@ HW_TRACE(0x36);
static void set_fault_to_battery_status(struct cardinfo *card)
{
if (card->battery[0].good && card->battery[1].good)
- set_led(card, LED_FAULT, LED_OFF);
+ set_led(card, MEMCTRL_LED_FAULT, MEMCTRL_LED_OFF);
else if (card->battery[0].warned || card->battery[1].warned)
- set_led(card, LED_FAULT, LED_ON);
+ set_led(card, MEMCTRL_LED_FAULT, MEMCTRL_LED_ON);
else if (!card->battery[0].good && !card->battery[1].good)
- set_led(card, LED_FAULT, LED_FLASH_7_0);
+ set_led(card, MEMCTRL_LED_FAULT, MEMCTRL_LED_FLASH_7_0);
else
- set_led(card, LED_FAULT, LED_FLASH_3_5);
+ set_led(card, MEMCTRL_LED_FAULT, MEMCTRL_LED_FLASH_3_5);
}
static void init_battery_timer(void);
@@ -919,8 +919,8 @@ static int mm_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
}
/* Clear the LED's we control */
- set_led(card, LED_REMOVE, LED_OFF);
- set_led(card, LED_FAULT, LED_OFF);
+ set_led(card, MEMCTRL_LED_REMOVE, MEMCTRL_LED_OFF);
+ set_led(card, MEMCTRL_LED_FAULT, MEMCTRL_LED_OFF);
batt_status = readb(card->csr_remap + MEMCTRLSTATUS_BATTERY);
diff --git a/drivers/block/umem.h b/drivers/block/umem.h
index 5838497..cc9cb37 100644
--- a/drivers/block/umem.h
+++ b/drivers/block/umem.h
@@ -32,16 +32,16 @@
#define MEM_2_GB 0xe0
#define MEMCTRLCMD_LEDCTRL 0x08
-#define LED_REMOVE 2
-#define LED_FAULT 4
-#define LED_POWER 6
-#define LED_FLIP 255
-#define LED_OFF 0x00
-#define LED_ON 0x01
-#define LED_FLASH_3_5 0x02
-#define LED_FLASH_7_0 0x03
-#define LED_POWER_ON 0x00
-#define LED_POWER_OFF 0x01
+#define MEMCTRL_LED_REMOVE 2
+#define MEMCTRL_LED_FAULT 4
+#define MEMCTRL_LED_POWER 6
+#define MEMCTRL_LED_FLIP 255
+#define MEMCTRL_LED_OFF 0x00
+#define MEMCTRL_LED_ON 0x01
+#define MEMCTRL_LED_FLASH_3_5 0x02
+#define MEMCTRL_LED_FLASH_7_0 0x03
+#define MEMCTRL_LED_POWER_ON 0x00
+#define MEMCTRL_LED_POWER_OFF 0x01
#define USER_BIT1 0x01
#define USER_BIT2 0x02
--
2.7.4
next prev parent reply other threads:[~2019-08-10 17:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-10 17:54 [PATCH v3 0/6] introduce LED block device activity trigger Akinobu Mita
2019-08-10 17:54 ` Akinobu Mita [this message]
2019-08-13 10:11 ` [PATCH v3 1/6] block: umem: rename LED_* macros to MEMCTRL_LED_* Pavel Machek
2019-08-10 17:54 ` [PATCH v3 2/6] scsi: mvsas: rename LED_* enums to SGPIO_LED_* Akinobu Mita
2019-08-13 10:12 ` Pavel Machek
2019-08-10 17:55 ` [PATCH v3 3/6] scsi: nsp32: rename LED_* macros to EXT_PORT_LED_* Akinobu Mita
2019-08-10 17:55 ` [PATCH v3 4/6] block: introduce LED block device activity trigger Akinobu Mita
2019-08-12 19:28 ` Jacek Anaszewski
2019-08-13 10:33 ` Pavel Machek
2019-08-13 15:40 ` Akinobu Mita
2019-08-10 17:55 ` [PATCH v3 5/6] ledtrig-blk: add interface to stop and restart polling disk stats Akinobu Mita
2019-08-12 19:31 ` Jacek Anaszewski
2019-08-13 15:37 ` Akinobu Mita
2019-08-10 17:55 ` [PATCH v3 6/6] scsi: sd: stop polling disk stats by ledtrig-blk during runtime suspend Akinobu Mita
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=1565459703-30513-2-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).