aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/ata/libata-core.c10
-rw-r--r--include/linux/libata.h2
2 files changed, 3 insertions, 9 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 623a6f272c7e..80ca94eb3ce0 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2530,8 +2530,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, "no device\n");
return 0;
}
@@ -5333,11 +5333,7 @@ struct ata_port *ata_port_alloc(struct ata_host *host)
#if defined(ATA_VERBOSE_DEBUG)
/* turn on all debugging levels */
- ap->msg_enable = 0x0003;
-#elif defined(ATA_DEBUG)
- ap->msg_enable = ATA_MSG_DRV | ATA_MSG_INFO;
-#else
- ap->msg_enable = ATA_MSG_DRV;
+ ap->msg_enable = 0x0001;
#endif
mutex_init(&ap->scsi_scan_mutex);
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 455d7e77e562..524d09b1dc82 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -73,11 +73,9 @@
enum {
ATA_MSG_DRV = 0x0001,
- ATA_MSG_INFO = 0x0002,
};
#define ata_msg_drv(p) ((p)->msg_enable & ATA_MSG_DRV)
-#define ata_msg_info(p) ((p)->msg_enable & ATA_MSG_INFO)
static inline u32 ata_msg_init(int dval, int default_msg_enable_bits)
{