Commit 4633778b authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Damien Le Moal
Browse files

ata: libata: move DPRINTK to ata debugging 



Replace all DPRINTK calls with ata_dev_dbg().

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

drivers/ata/libata-core.c

+6 −9
Original line number Diff line number Diff line
@@ -1965,7 +1965,7 @@ unsigned int ata_read_log_page(struct ata_device *dev, u8 log, 
	unsigned int err_mask;

	bool dma = false;



	DPRINTK("read log page - log 0x%x, page 0x%x\n", log, page);

	ata_dev_dbg(dev, "read log page - log 0x%x, page 0x%x\n", log, page);



	/*

	 * Return error without actually issuing the command on controllers
@@ -3341,7 +3341,7 @@ static int ata_dev_set_mode(struct ata_device *dev) 
			dev_err_whine = " (device error ignored)";

	}



	DPRINTK("xfer_shift=%u, xfer_mode=0x%x\n",

	ata_dev_dbg(dev, "xfer_shift=%u, xfer_mode=0x%x\n",

		    dev->xfer_shift, (int)dev->xfer_mode);



	if (!(ehc->i.flags & ATA_EHI_QUIET) ||
@@ -4288,7 +4288,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev) 
	unsigned int err_mask;



	/* set up set-features taskfile */

	DPRINTK("set features - xfer mode\n");

	ata_dev_dbg(dev, "set features - xfer mode\n");



	/* Some controllers and ATAPI devices show flaky interrupt

	 * behavior after setting xfer mode.  Use polling instead.
@@ -4310,7 +4310,6 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev) 
	/* On some disks, this command causes spin-up, so we need longer timeout */

	err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, 15000);



	DPRINTK("EXIT, err_mask=%x\n", err_mask);

	return err_mask;

}
@@ -4336,7 +4335,7 @@ unsigned int ata_dev_set_feature(struct ata_device *dev, u8 enable, u8 feature) 
	unsigned long timeout = 0;



	/* set up set-features taskfile */

	DPRINTK("set features - SATA features\n");

	ata_dev_dbg(dev, "set features - SATA features\n");



	ata_tf_init(dev, &tf);

	tf.command = ATA_CMD_SET_FEATURES;
@@ -4350,7 +4349,6 @@ unsigned int ata_dev_set_feature(struct ata_device *dev, u8 enable, u8 feature) 
			  ata_probe_timeout * 1000 : SETFEATURES_SPINUP_TIMEOUT;

	err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, timeout);



	DPRINTK("EXIT, err_mask=%x\n", err_mask);

	return err_mask;

}

EXPORT_SYMBOL_GPL(ata_dev_set_feature);
@@ -4378,7 +4376,7 @@ static unsigned int ata_dev_init_params(struct ata_device *dev, 
		return AC_ERR_INVALID;



	/* set up init dev params taskfile */

	DPRINTK("init dev params \n");

	ata_dev_dbg(dev, "init dev params \n");



	ata_tf_init(dev, &tf);

	tf.command = ATA_CMD_INIT_DEV_PARAMS;
@@ -4394,7 +4392,6 @@ static unsigned int ata_dev_init_params(struct ata_device *dev, 
	if (err_mask == AC_ERR_DEV && (tf.feature & ATA_ABORTED))

		err_mask = 0;



	DPRINTK("EXIT, err_mask=%x\n", err_mask);

	return err_mask;

}