diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2009-03-31 14:15:32 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 14:15:32 -0400 |
commit | abb596b25edac1ec1acc4ef53df190771661c3d2 (patch) | |
tree | d20ea24960358ce03e0f27eefd2e6911afd1309c /drivers/ide/tx4939ide.c | |
parent | 0f861e8c47ede537a8ad280c61d5d00d541f04db (diff) |
ide: turn selectproc() method into dev_select() method (take 5)
Turn selectproc() method into dev_select() method by teaching it to write to the
device register and moving it from 'struct ide_port_ops' to 'struct ide_tp_ops'.
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: benh@kernel.crashing.org
Cc: petkovbb@gmail.com
[bart: add ->dev_select to at91_ide.c and tx4939.c (__BIG_ENDIAN case)]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/tx4939ide.c')
-rw-r--r-- | drivers/ide/tx4939ide.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c index 5a614d1c94f1..0040a9a3e26e 100644 --- a/drivers/ide/tx4939ide.c +++ b/drivers/ide/tx4939ide.c | |||
@@ -429,7 +429,7 @@ static void tx4939ide_tf_load_fixup(ide_drive_t *drive) | |||
429 | * Fix ATA100 CORE System Control Register. (The write to the | 429 | * Fix ATA100 CORE System Control Register. (The write to the |
430 | * Device/Head register may write wrong data to the System | 430 | * Device/Head register may write wrong data to the System |
431 | * Control Register) | 431 | * Control Register) |
432 | * While Sys_Ctl is written here, selectproc is not needed. | 432 | * While Sys_Ctl is written here, dev_select() is not needed. |
433 | */ | 433 | */ |
434 | tx4939ide_writew(sysctl, base, TX4939IDE_Sys_Ctl); | 434 | tx4939ide_writew(sysctl, base, TX4939IDE_Sys_Ctl); |
435 | } | 435 | } |
@@ -556,6 +556,7 @@ static const struct ide_tp_ops tx4939ide_tp_ops = { | |||
556 | .read_altstatus = ide_read_altstatus, | 556 | .read_altstatus = ide_read_altstatus, |
557 | .write_devctl = ide_write_devctl, | 557 | .write_devctl = ide_write_devctl, |
558 | 558 | ||
559 | .dev_select = ide_dev_select, | ||
559 | .tf_load = tx4939ide_tf_load, | 560 | .tf_load = tx4939ide_tf_load, |
560 | .tf_read = tx4939ide_tf_read, | 561 | .tf_read = tx4939ide_tf_read, |
561 | 562 | ||
@@ -579,6 +580,7 @@ static const struct ide_tp_ops tx4939ide_tp_ops = { | |||
579 | .read_altstatus = ide_read_altstatus, | 580 | .read_altstatus = ide_read_altstatus, |
580 | .write_devctl = ide_write_devctl, | 581 | .write_devctl = ide_write_devctl, |
581 | 582 | ||
583 | .dev_select = ide_dev_select, | ||
582 | .tf_load = tx4939ide_tf_load, | 584 | .tf_load = tx4939ide_tf_load, |
583 | .tf_read = ide_tf_read, | 585 | .tf_read = ide_tf_read, |
584 | 586 | ||