aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-atapi.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-01-06 11:20:50 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-01-06 11:20:50 -0500
commitb65fac32cfe3b2f98cd472fef400bd1c1340de23 (patch)
tree493a7e30e23e5413a9e5ad6102b8e91ebc02c069 /drivers/ide/ide-atapi.c
parent5b31f855f10d0053e738baa6d91fb6a3fad35119 (diff)
ide: merge ide_hwgroup_t with ide_hwif_t (v2)
* Merge ide_hwgroup_t with ide_hwif_t. * Cleanup init_irq() accordingly, then remove no longer needed ide_remove_port_from_hwgroup() and ide_ports[]. * Remove now unused HWGROUP() macro. While at it: * ide_dump_ata_error() fixups v2: * Fix ->quirk_list check in do_ide_request() (s/hwif->cur_dev/prev_port->cur_dev). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-atapi.c')
-rw-r--r--drivers/ide/ide-atapi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index e8688c0f8645..d6a50d67b7db 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -243,7 +243,7 @@ EXPORT_SYMBOL_GPL(ide_retry_pc);
243 243
244int ide_cd_expiry(ide_drive_t *drive) 244int ide_cd_expiry(ide_drive_t *drive)
245{ 245{
246 struct request *rq = HWGROUP(drive)->rq; 246 struct request *rq = drive->hwif->rq;
247 unsigned long wait = 0; 247 unsigned long wait = 0;
248 248
249 debug_log("%s: rq->cmd[0]: 0x%x\n", __func__, rq->cmd[0]); 249 debug_log("%s: rq->cmd[0]: 0x%x\n", __func__, rq->cmd[0]);
@@ -294,7 +294,7 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
294{ 294{
295 struct ide_atapi_pc *pc = drive->pc; 295 struct ide_atapi_pc *pc = drive->pc;
296 ide_hwif_t *hwif = drive->hwif; 296 ide_hwif_t *hwif = drive->hwif;
297 struct request *rq = hwif->hwgroup->rq; 297 struct request *rq = hwif->rq;
298 const struct ide_tp_ops *tp_ops = hwif->tp_ops; 298 const struct ide_tp_ops *tp_ops = hwif->tp_ops;
299 xfer_func_t *xferfunc; 299 xfer_func_t *xferfunc;
300 unsigned int timeout, temp; 300 unsigned int timeout, temp;
@@ -491,7 +491,7 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
491{ 491{
492 struct ide_atapi_pc *uninitialized_var(pc); 492 struct ide_atapi_pc *uninitialized_var(pc);
493 ide_hwif_t *hwif = drive->hwif; 493 ide_hwif_t *hwif = drive->hwif;
494 struct request *rq = hwif->hwgroup->rq; 494 struct request *rq = hwif->rq;
495 ide_expiry_t *expiry; 495 ide_expiry_t *expiry;
496 unsigned int timeout; 496 unsigned int timeout;
497 int cmd_len; 497 int cmd_len;
@@ -580,7 +580,7 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive)
580 580
581 if (dev_is_idecd(drive)) { 581 if (dev_is_idecd(drive)) {
582 tf_flags = IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL; 582 tf_flags = IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL;
583 bcount = ide_cd_get_xferlen(hwif->hwgroup->rq); 583 bcount = ide_cd_get_xferlen(hwif->rq);
584 expiry = ide_cd_expiry; 584 expiry = ide_cd_expiry;
585 timeout = ATAPI_WAIT_PC; 585 timeout = ATAPI_WAIT_PC;
586 586