Commit 5cef96b4 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Damien Le Moal
Browse files

ata: libata: drop ata_msg_ctl() 



The one caller have been converted to dynamic debugging.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent d97c75ed

drivers/ata/libata-core.c

+2 −5
Original line number Diff line number Diff line
@@ -1763,9 +1763,6 @@ int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class, 
	int may_fallback = 1, tried_spinup = 0;

	int rc;



	if (ata_msg_ctl(ap))

		ata_dev_dbg(dev, "%s: ENTER\n", __func__);



retry:

	ata_tf_init(dev, &tf);
@@ -5345,9 +5342,9 @@ struct ata_port *ata_port_alloc(struct ata_host *host) 


#if defined(ATA_VERBOSE_DEBUG)

	/* turn on all debugging levels */

	ap->msg_enable = 0x003F;

	ap->msg_enable = 0x001F;

#elif defined(ATA_DEBUG)

	ap->msg_enable = ATA_MSG_DRV | ATA_MSG_INFO | ATA_MSG_CTL | ATA_MSG_WARN;

	ap->msg_enable = ATA_MSG_DRV | ATA_MSG_INFO | ATA_MSG_WARN;

#else

	ap->msg_enable = ATA_MSG_DRV | ATA_MSG_WARN;

#endif

include/linux/libata.h

+0 −2
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ enum { 
	ATA_MSG_PROBE	= 0x0004,

	ATA_MSG_WARN	= 0x0008,

	ATA_MSG_MALLOC	= 0x0010,

	ATA_MSG_CTL	= 0x0020,

};



#define ata_msg_drv(p)    ((p)->msg_enable & ATA_MSG_DRV)
@@ -85,7 +84,6 @@ enum { 
#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)

#define ata_msg_ctl(p)    ((p)->msg_enable & ATA_MSG_CTL)



static inline u32 ata_msg_init(int dval, int default_msg_enable_bits)

{