From: Alan Cox Signed-off-by: Alan Cox Signed-off-by: Andrew Morton --- drivers/ata/ata_generic.c | 33 ++------------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff -puN drivers/ata/ata_generic.c~ata_generic-remove-all-the-crud-again-and-use-cable drivers/ata/ata_generic.c --- a/drivers/ata/ata_generic.c~ata_generic-remove-all-the-crud-again-and-use-cable +++ a/drivers/ata/ata_generic.c @@ -33,36 +33,6 @@ */ /** - * generic_pre_reset - probe begin - * @ap: ATA port - * @deadline: deadline jiffies for the operation - * - * Set up cable type and use generic probe init - */ - -static int generic_pre_reset(struct ata_port *ap, unsigned long deadline) -{ - ap->cbl = ATA_CBL_PATA80; - return ata_std_prereset(ap, deadline); -} - - -/** - * generic_error_handler - Probe specified port on PATA host controller - * @ap: Port to probe - * @classes: - * - * LOCKING: - * None (inherited from caller). - */ - - -static void generic_error_handler(struct ata_port *ap) -{ - ata_bmdma_drive_eh(ap, generic_pre_reset, ata_std_softreset, NULL, ata_std_postreset); -} - -/** * generic_set_mode - mode setting * @ap: interface to set up * @unused: returned device on error @@ -145,8 +115,9 @@ static struct ata_port_operations generi .freeze = ata_bmdma_freeze, .thaw = ata_bmdma_thaw, - .error_handler = generic_error_handler, + .error_handler = ata_bmdma_error_handler, .post_internal_cmd = ata_bmdma_post_internal_cmd, + .cable_detect = ata_cable_unknown, .qc_prep = ata_qc_prep, .qc_issue = ata_qc_issue_prot, _