Skip to content

Commit

Permalink
[PATCH] libata: move ata_do_simple_cmd() below ata_exec_internal()
Browse files Browse the repository at this point in the history
Move ata_do_simple_cmd() below ata_exec_internal() for consistency.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Tejun Heo authored and Jeff Garzik committed Jun 27, 2006
1 parent beb07c1 commit e58eb58
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions drivers/scsi/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit e58eb58

Please sign in to comment.