From: Alan Cox Signed-off-by: Alan Cox Signed-off-by: Andrew Morton --- drivers/ata/pata_cypress.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff -puN drivers/ata/pata_cypress.c~pata_cypress-clean-up-by-using-cable_detect-method drivers/ata/pata_cypress.c --- a/drivers/ata/pata_cypress.c~pata_cypress-clean-up-by-using-cable_detect-method +++ a/drivers/ata/pata_cypress.c @@ -41,17 +41,6 @@ enum { CY82_INDEX_TIMEOUT = 0x32 }; -static int cy82c693_pre_reset(struct ata_port *ap) -{ - ap->cbl = ATA_CBL_PATA40; - return ata_std_prereset(ap); -} - -static void cy82c693_error_handler(struct ata_port *ap) -{ - ata_bmdma_drive_eh(ap, cy82c693_pre_reset, ata_std_softreset, NULL, ata_std_postreset); -} - /** * cy82c693_set_piomode - set initial PIO mode data * @ap: ATA interface @@ -154,8 +143,9 @@ static struct ata_port_operations cy82c6 .freeze = ata_bmdma_freeze, .thaw = ata_bmdma_thaw, - .error_handler = cy82c693_error_handler, + .error_handler = ata_bmdma_error_handler, .post_internal_cmd = ata_bmdma_post_internal_cmd, + .cable_detect = ata_cable_40wire, .bmdma_setup = ata_bmdma_setup, .bmdma_start = ata_bmdma_start, _