Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e58eb583 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[PATCH] libata: move ata_do_simple_cmd() below ata_exec_internal() 



Move ata_do_simple_cmd() below ata_exec_internal() for consistency.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent beb07c1a

drivers/scsi/libata-core.c

+23 −23
Original line number Diff line number Diff line
@@ -1131,6 +1131,29 @@ unsigned ata_exec_internal(struct ata_device *dev, 
	return err_mask;

}



/*

 * Execute a 'simple' command, that only consists of the opcode 'cmd' itself,

 * without filling any other registers

 */

static int ata_do_simple_cmd(struct ata_device *dev, u8 cmd)

{

	struct ata_taskfile tf;

	int err;



	ata_tf_init(dev, &tf);



	tf.command = cmd;

	tf.flags |= ATA_TFLAG_DEVICE;

	tf.protocol = ATA_PROT_NODATA;



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

	if (err)

		ata_dev_printk(dev, KERN_ERR, "%s: ata command failed: %d\n",

			       __FUNCTION__, err);



	return err;

}



/**

 *	ata_pio_need_iordy	-	check if iordy needed

 *	@adev: ATA device
@@ -4946,29 +4969,6 @@ int ata_port_offline(struct ata_port *ap) 
	return 0;

}



/*

 * Execute a 'simple' command, that only consists of the opcode 'cmd' itself,

 * without filling any other registers

 */

static int ata_do_simple_cmd(struct ata_device *dev, u8 cmd)

{

	struct ata_taskfile tf;

	int err;



	ata_tf_init(dev, &tf);



	tf.command = cmd;

	tf.flags |= ATA_TFLAG_DEVICE;

	tf.protocol = ATA_PROT_NODATA;



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

	if (err)

		ata_dev_printk(dev, KERN_ERR, "%s: ata command failed: %d\n",

			       __FUNCTION__, err);



	return err;

}



static int ata_flush_cache(struct ata_device *dev)

{

	u8 cmd;