diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:23 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:23 -0400 |
commit | 50672e5d7486c9ab312432cbe180ac071f1de8e0 (patch) | |
tree | 23e7c391aaba0b3ddde1495bbfcb123548a50f2c /drivers/ide/ide.c | |
parent | 2dde7861afa23cd59db83515cb0b810b92b220aa (diff) |
ide: remove dead/obsolete ->busproc method
->busproc method is used by HDIO_SET_BUSSTATE ioctl but it has no chance
of working as intended (in 2.4.x days) because to issue an ioctl there
is a device node needed and:
- for BUSSTATE_TRISTATE+OFF it is too late (devices are already gone)
- for BUSSTATE_TRISTATE+ON it is too early (devices are not registered yet)
Just remove ->busproc method for now (it was only implemented by hpt366,
siimage and tc86c001 host drivers).
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r-- | drivers/ide/ide.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index a8b5b08dd6e2..cb18ba8de22d 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -414,7 +414,6 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif) | |||
414 | hwif->resetproc = tmp_hwif->resetproc; | 414 | hwif->resetproc = tmp_hwif->resetproc; |
415 | hwif->maskproc = tmp_hwif->maskproc; | 415 | hwif->maskproc = tmp_hwif->maskproc; |
416 | hwif->quirkproc = tmp_hwif->quirkproc; | 416 | hwif->quirkproc = tmp_hwif->quirkproc; |
417 | hwif->busproc = tmp_hwif->busproc; | ||
418 | 417 | ||
419 | hwif->ata_input_data = tmp_hwif->ata_input_data; | 418 | hwif->ata_input_data = tmp_hwif->ata_input_data; |
420 | hwif->ata_output_data = tmp_hwif->ata_output_data; | 419 | hwif->ata_output_data = tmp_hwif->ata_output_data; |
@@ -1071,8 +1070,6 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device | |||
1071 | case HDIO_SET_BUSSTATE: | 1070 | case HDIO_SET_BUSSTATE: |
1072 | if (!capable(CAP_SYS_ADMIN)) | 1071 | if (!capable(CAP_SYS_ADMIN)) |
1073 | return -EACCES; | 1072 | return -EACCES; |
1074 | if (HWIF(drive)->busproc) | ||
1075 | return HWIF(drive)->busproc(drive, (int)arg); | ||
1076 | return -EOPNOTSUPP; | 1073 | return -EOPNOTSUPP; |
1077 | default: | 1074 | default: |
1078 | return -EINVAL; | 1075 | return -EINVAL; |