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/pci/tc86c001.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/pci/tc86c001.c')
-rw-r--r-- | drivers/ide/pci/tc86c001.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c index 2ef2ed2f2b32..1e4a6262bcef 100644 --- a/drivers/ide/pci/tc86c001.c +++ b/drivers/ide/pci/tc86c001.c | |||
@@ -126,40 +126,6 @@ static void tc86c001_dma_start(ide_drive_t *drive) | |||
126 | ide_dma_start(drive); | 126 | ide_dma_start(drive); |
127 | } | 127 | } |
128 | 128 | ||
129 | static int tc86c001_busproc(ide_drive_t *drive, int state) | ||
130 | { | ||
131 | ide_hwif_t *hwif = HWIF(drive); | ||
132 | unsigned long sc_base = hwif->config_data; | ||
133 | u16 scr1; | ||
134 | |||
135 | /* System Control 1 Register bit 11 (ATA Hard Reset) read */ | ||
136 | scr1 = inw(sc_base + 0x00); | ||
137 | |||
138 | switch (state) { | ||
139 | case BUSSTATE_ON: | ||
140 | if (!(scr1 & 0x0800)) | ||
141 | return 0; | ||
142 | scr1 &= ~0x0800; | ||
143 | |||
144 | hwif->drives[0].failures = hwif->drives[1].failures = 0; | ||
145 | break; | ||
146 | case BUSSTATE_OFF: | ||
147 | if (scr1 & 0x0800) | ||
148 | return 0; | ||
149 | scr1 |= 0x0800; | ||
150 | |||
151 | hwif->drives[0].failures = hwif->drives[0].max_failures + 1; | ||
152 | hwif->drives[1].failures = hwif->drives[1].max_failures + 1; | ||
153 | break; | ||
154 | default: | ||
155 | return -EINVAL; | ||
156 | } | ||
157 | |||
158 | /* System Control 1 Register bit 11 (ATA Hard Reset) write */ | ||
159 | outw(scr1, sc_base + 0x00); | ||
160 | return 0; | ||
161 | } | ||
162 | |||
163 | static u8 __devinit tc86c001_cable_detect(ide_hwif_t *hwif) | 129 | static u8 __devinit tc86c001_cable_detect(ide_hwif_t *hwif) |
164 | { | 130 | { |
165 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 131 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
@@ -194,8 +160,6 @@ static void __devinit init_hwif_tc86c001(ide_hwif_t *hwif) | |||
194 | hwif->set_pio_mode = &tc86c001_set_pio_mode; | 160 | hwif->set_pio_mode = &tc86c001_set_pio_mode; |
195 | hwif->set_dma_mode = &tc86c001_set_mode; | 161 | hwif->set_dma_mode = &tc86c001_set_mode; |
196 | 162 | ||
197 | hwif->busproc = &tc86c001_busproc; | ||
198 | |||
199 | hwif->cable_detect = tc86c001_cable_detect; | 163 | hwif->cable_detect = tc86c001_cable_detect; |
200 | 164 | ||
201 | if (!hwif->dma_base) | 165 | if (!hwif->dma_base) |