[PATCH 43/46] libata: kill ATA_MSG_INFO

Hannes Reinecke
2020-02-04T16:56:20Z

From: Hannes Reinecke <hare@suse.com>

Just a single user, which should be converted to ata_dev_dbg() anyway.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/ata/libata-core.c | 6 +++---
include/linux/libata.h | 2 --
2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 73f89026b2a2..a81e7006e73f 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2454,8 +2454,8 @@ int ata_dev_configure(struct ata_device *dev)
char modelbuf[ATA_ID_PROD_LEN+1];
int rc;

- if (!ata_dev_enabled(dev) && ata_msg_info(ap)) {
- ata_dev_info(dev, "%s: ENTER/EXIT -- nodev\n", __func__);
+ if (!ata_dev_enabled(dev)) {
+ ata_dev_dbg(dev, "ENTER/EXIT -- nodev\n");
return 0;
}

@@ -6036,7 +6036,7 @@ struct ata_port *ata_port_alloc(struct ata_host *host)
/* turn on all debugging levels */
ap->msg_enable = 0x00FF;
#elif defined(ATA_DEBUG)
- ap->msg_enable = ATA_MSG_DRV | ATA_MSG_INFO | ATA_MSG_CTL | ATA_MSG_WARN | ATA_MSG_ERR;
+ ap->msg_enable = ATA_MSG_DRV | ATA_MSG_CTL | ATA_MSG_WARN | ATA_MSG_ERR;
#else
ap->msg_enable = ATA_MSG_DRV | ATA_MSG_ERR | ATA_MSG_WARN;
#endif
diff --git a/include/linux/libata.h b/include/linux/libata.h
index e2578d87d931..cab7aa3f0ed0 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -70,7 +70,6 @@

enum {
ATA_MSG_DRV = 0x0001,
- ATA_MSG_INFO = 0x0002,
ATA_MSG_PROBE = 0x0004,
ATA_MSG_WARN = 0x0008,
ATA_MSG_MALLOC = 0x0010,
@@ -80,7 +79,6 @@ enum {
};

#define ata_msg_drv(p) ((p)->msg_enable & ATA_MSG_DRV)
-#define ata_msg_info(p) ((p)->msg_enable & ATA_MSG_INFO)
#define ata_msg_probe(p) ((p)->msg_enable & ATA_MSG_PROBE)
#define ata_msg_warn(p) ((p)->msg_enable & ATA_MSG_WARN)
#define ata_msg_malloc(p) ((p)->msg_enable & ATA_MSG_MALLOC)
--
2.16.4