The patch titled pata_radisys - switch to cable method to cleanup code, correct cable type has been added to the -mm tree. Its filename is pata_radisys-switch-to-cable-method-to-cleanup-code.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: pata_radisys - switch to cable method to cleanup code, correct cable type From: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Alan Cox <alan@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/ata/pata_radisys.c | 37 ++++------------------------------- 1 files changed, 5 insertions(+), 32 deletions(-) diff -puN drivers/ata/pata_radisys.c~pata_radisys-switch-to-cable-method-to-cleanup-code drivers/ata/pata_radisys.c --- a/drivers/ata/pata_radisys.c~pata_radisys-switch-to-cable-method-to-cleanup-code +++ a/drivers/ata/pata_radisys.c @@ -24,40 +24,12 @@ #include <linux/ata.h> #define DRV_NAME "pata_radisys" -#define DRV_VERSION "0.4.1" - -/** - * radisys_probe_init - probe begin - * @ap: ATA port - * - * Set up cable type and use generic probe init - */ - -static int radisys_pre_reset(struct ata_port *ap) -{ - ap->cbl = ATA_CBL_PATA80; - return ata_std_prereset(ap); -} - - -/** - * radisys_pata_error_handler - Probe specified port on PATA host controller - * @ap: Port to probe - * @classes: - * - * LOCKING: - * None (inherited from caller). - */ - -static void radisys_pata_error_handler(struct ata_port *ap) -{ - ata_bmdma_drive_eh(ap, radisys_pre_reset, ata_std_softreset, NULL, ata_std_postreset); -} +#define DRV_VERSION "0.4.4" /** * radisys_set_piomode - Initialize host controller PATA PIO timings - * @ap: Port whose timings we are configuring - * @adev: um + * @ap: ATA port + * @adev: Device whose timings we are configuring * * Set PIO mode for device, in host controller PCI config space. * @@ -246,8 +218,9 @@ static const struct ata_port_operations .freeze = ata_bmdma_freeze, .thaw = ata_bmdma_thaw, - .error_handler = radisys_pata_error_handler, + .error_handler = ata_bmdma_error_handler, .post_internal_cmd = ata_bmdma_post_internal_cmd, + .cable_detect = ata_cable_unknown, .bmdma_setup = ata_bmdma_setup, .bmdma_start = ata_bmdma_start, _ Patches currently in -mm which might be from alan@xxxxxxxxxxxxxxxxxxx are cyclades-return-closing_wait.patch libata-warn-if-speed-limited-due-to-40-wire-cable-v2.patch expose-set_mode-method-so-it-can-be-wrapped.patch acpi-driver-support-for-pata.patch pcmcia-spot-slave-decode-flaws-for-testing.patch libata-cable-detection-fixes.patch libata-dev_config-does-not-need-ap-and-adev-passing.patch pata_platform-set-a-cable-type-which-to-set.patch pata_qdi-set-cable-type.patch pata_sl82c105-missing-methods-cable.patch ata_generic-remove-lots-of-code-using-the-new-cable_detect.patch pata_ali-remove-lots-of-code-by-using-the-cable_detect.patch pata_cs55x0-clean-up-by-using-the-cable_detect-method.patch pata_cypress-clean-up-by-using-cable_detect-method.patch pata_isapnp-set-cable-type.patch pata_ixp4xx_cf-set-cable-type.patch pata_legacy-fix-missing-methods-and-add-cable-types.patch pata_netcell-remove-lots-of-crud-by-using-the-cable-method.patch pata_radisys-switch-to-cable-method-to-cleanup-code.patch pata_sc1200-set-cable-type-add-freeze-thaw-methods.patch pata_rz1000-remove-lots-of-crap-by-using-cable-method.patch pata_winbond-set-cable-type.patch pata_cmd64x-various-fixes.patch pata_hpt3x3-clean-up-by-using-cable-method.patch libata-fix-hopefully-all-the-remaining-problems-with.patch resend-iphase-64bit-cleanup.patch drivers-scsi-ncr5380c-replacing-yield-with-a.patch drivers-scsi-mca_53c9xc-save_flags-cli-removal.patch x86_64-do-not-enable-the-nmi-watchdog-by-default.patch driver_bfin_serial_core.patch driver_bfin_serial_core-update.patch documentation-ask-driver-writers-to-provide-pm-support.patch fixes-and-cleanups-for-earlyprintk-aka-boot-console.patch tty-clarify-documentation-of-write.patch edac-new-opteron-athlon64-memory-controller-driver.patch edac-k8-driver-coding-tidy.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html