Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 234983
b: refs/heads/master
c: c211962
h: refs/heads/master
i:
  234981: fcc4650
  234979: fe14f8f
  234975: c9d9bd1
v: v3
  • Loading branch information
Sergei Shtylyov authored and Jeff Garzik committed Mar 2, 2011
1 parent 54aa80a commit 22052e0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b83a4c397952a0c05b5468c0403a32e87bb35fef
refs/heads/master: c211962dc12d609effbf00a2c5c6fc38cc1dbc54
14 changes: 8 additions & 6 deletions trunk/drivers/ata/sata_dwc_460ex.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,11 @@
#include <scsi/scsi_host.h>
#include <scsi/scsi_cmnd.h>

/* These two are defined in "libata.h" */
#undef DRV_NAME
#undef DRV_VERSION
#define DRV_NAME "sata-dwc"
#define DRV_VERSION "1.0"
#define DRV_VERSION "1.1"

/* SATA DMA driver Globals */
#define DMA_NUM_CHANS 1
Expand Down Expand Up @@ -1354,7 +1357,7 @@ static void sata_dwc_exec_command_by_tag(struct ata_port *ap,
struct sata_dwc_device_port *hsdevp = HSDEVP_FROM_AP(ap);

dev_dbg(ap->dev, "%s cmd(0x%02x): %s tag=%d\n", __func__, tf->command,
ata_get_cmd_descript(tf), tag);
ata_get_cmd_descript(tf->command), tag);

spin_lock_irqsave(&ap->host->lock, flags);
hsdevp->cmd_issued[tag] = cmd_issued;
Expand Down Expand Up @@ -1462,7 +1465,6 @@ static void sata_dwc_qc_prep_by_tag(struct ata_queued_cmd *qc, u8 tag)
int dma_chan;
struct sata_dwc_device *hsdev = HSDEV_FROM_AP(ap);
struct sata_dwc_device_port *hsdevp = HSDEVP_FROM_AP(ap);
int err;

dev_dbg(ap->dev, "%s: port=%d dma dir=%s n_elem=%d\n",
__func__, ap->port_no, ata_get_cmd_descript(qc->dma_dir),
Expand All @@ -1474,7 +1476,7 @@ static void sata_dwc_qc_prep_by_tag(struct ata_queued_cmd *qc, u8 tag)
dmadr), qc->dma_dir);
if (dma_chan < 0) {
dev_err(ap->dev, "%s: dma_dwc_xfer_setup returns err %d\n",
__func__, err);
__func__, dma_chan);
return;
}
hsdevp->dma_chan[tag] = dma_chan;
Expand All @@ -1491,7 +1493,7 @@ static unsigned int sata_dwc_qc_issue(struct ata_queued_cmd *qc)
dev_info(ap->dev, "%s ap id=%d cmd(0x%02x)=%s qc tag=%d "
"prot=%s ap active_tag=0x%08x ap sactive=0x%08x\n",
__func__, ap->print_id, qc->tf.command,
ata_get_cmd_descript(&qc->tf),
ata_get_cmd_descript(qc->tf.command),
qc->tag, ata_get_cmd_descript(qc->tf.protocol),
ap->link.active_tag, ap->link.sactive);
#endif
Expand Down Expand Up @@ -1533,7 +1535,7 @@ static void sata_dwc_qc_prep(struct ata_queued_cmd *qc)
#ifdef DEBUG_NCQ
if (qc->tag > 0)
dev_info(qc->ap->dev, "%s: qc->tag=%d ap->active_tag=0x%08x\n",
__func__, tag, qc->ap->link.active_tag);
__func__, qc->tag, qc->ap->link.active_tag);

return ;
#endif
Expand Down

0 comments on commit 22052e0

Please sign in to comment.