Commit 17a1e1be authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Damien Le Moal
Browse files

ata: libata: drop ata_msg_probe() 



All callsites 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 16d42467

drivers/ata/libata-acpi.c

+7 −16
Original line number Diff line number Diff line
@@ -402,7 +402,6 @@ EXPORT_SYMBOL_GPL(ata_acpi_stm); 
 */

static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf)

{

	struct ata_port *ap = dev->link->ap;

	acpi_status status;

	struct acpi_buffer output;

	union acpi_object *out_obj;
@@ -418,10 +417,6 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf) 
	output.length = ACPI_ALLOCATE_BUFFER;

	output.pointer = NULL;	/* ACPI-CA sets this; save/free it later */



	if (ata_msg_probe(ap))

		ata_dev_dbg(dev, "%s: ENTER: port#: %d\n",

			    __func__, ap->port_no);



	/* _GTF has no input parameters */

	status = acpi_evaluate_object(ata_dev_acpi_handle(dev), "_GTF", NULL,

				      &output);
@@ -437,9 +432,7 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf) 
	}



	if (!output.length || !output.pointer) {

		if (ata_msg_probe(ap))

			ata_dev_dbg(dev, "%s: Run _GTF: length or ptr is NULL (0x%llx, 0x%p)\n",

				    __func__,

		ata_dev_dbg(dev, "Run _GTF: length or ptr is NULL (0x%llx, 0x%p)\n",

			    (unsigned long long)output.length,

			    output.pointer);

		rc = -EINVAL;
@@ -464,9 +457,8 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf) 
	rc = out_obj->buffer.length / REGS_PER_GTF;

	if (gtf) {

		*gtf = (void *)out_obj->buffer.pointer;

		if (ata_msg_probe(ap))

			ata_dev_dbg(dev, "%s: returning gtf=%p, gtf_count=%d\n",

				    __func__, *gtf, rc);

		ata_dev_dbg(dev, "returning gtf=%p, gtf_count=%d\n",

			    *gtf, rc);

	}

	return rc;
@@ -778,7 +770,6 @@ static int ata_acpi_push_id(struct ata_device *dev) 
	struct acpi_object_list input;

	union acpi_object in_params[1];



	if (ata_msg_probe(ap))

	ata_dev_dbg(dev, "%s: ix = %d, port#: %d\n",

		    __func__, dev->devno, ap->port_no);

drivers/ata/libata-core.c

+7 −13
Original line number Diff line number Diff line
@@ -2535,9 +2535,6 @@ int ata_dev_configure(struct ata_device *dev) 
		return 0;

	}



	if (ata_msg_probe(ap))

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



	/* set horkage */

	dev->horkage |= ata_dev_blacklisted(dev);

	ata_force_horkage(dev);
@@ -2585,7 +2582,6 @@ int ata_dev_configure(struct ata_device *dev) 
		return rc;



	/* print device capabilities */

	if (ata_msg_probe(ap))

	ata_dev_dbg(dev,

		    "%s: cfg 49:%04x 82:%04x 83:%04x 84:%04x "

		    "85:%04x 86:%04x 87:%04x 88:%04x\n",
@@ -2791,8 +2787,6 @@ int ata_dev_configure(struct ata_device *dev) 
	return 0;



err_out_nosup:

	if (ata_msg_probe(ap))

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

	return rc;

}
@@ -5339,7 +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 = 0x0007;

	ap->msg_enable = 0x0003;

#elif defined(ATA_DEBUG)

	ap->msg_enable = ATA_MSG_DRV | ATA_MSG_INFO;

#else

drivers/ata/libata-sff.c

+0 −4
Original line number Diff line number Diff line
@@ -330,10 +330,6 @@ EXPORT_SYMBOL_GPL(ata_sff_dev_select); 
static void ata_dev_select(struct ata_port *ap, unsigned int device,

			   unsigned int wait, unsigned int can_sleep)

{

	if (ata_msg_probe(ap))

		ata_port_info(ap, "ata_dev_select: ENTER, device %u, wait %u\n",

			      device, wait);



	if (wait)

		ata_wait_idle(ap);

include/linux/libata.h

+0 −2
Original line number Diff line number Diff line
@@ -74,12 +74,10 @@ 
enum {

	ATA_MSG_DRV	= 0x0001,

	ATA_MSG_INFO	= 0x0002,

	ATA_MSG_PROBE	= 0x0004,

};



#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)



static inline u32 ata_msg_init(int dval, int default_msg_enable_bits)

{