The patch titled pata_efar: switch to cable_detect method has been removed from the -mm tree. Its filename was pata_efar-switch-to-cable_detect-method.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ Subject: pata_efar: switch to cable_detect method From: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Unfortunately the device differs also in the higher speeds mode setup so we can't merge it into ata_piix even though its a sort of clone. Signed-off-by: Alan Cox <alan@xxxxxxxxxx> Cc: Jeff Garzik <jeff@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/ata/pata_efar.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff -puN drivers/ata/pata_efar.c~pata_efar-switch-to-cable_detect-method drivers/ata/pata_efar.c --- a/drivers/ata/pata_efar.c~pata_efar-switch-to-cable_detect-method +++ a/drivers/ata/pata_efar.c @@ -22,10 +22,10 @@ #include <linux/ata.h> #define DRV_NAME "pata_efar" -#define DRV_VERSION "0.4.3" +#define DRV_VERSION "0.4.4" /** - * efar_pre_reset - check for 40/80 pin + * efar_pre_reset - Enable bits * @ap: Port * * Perform cable detection for the EFAR ATA interface. This is @@ -40,16 +40,8 @@ static int efar_pre_reset(struct ata_por }; struct pci_dev *pdev = to_pci_dev(ap->host->dev); - u8 tmp; - if (!pci_test_config_bits(pdev, &efar_enable_bits[ap->port_no])) return -ENOENT; - - pci_read_config_byte(pdev, 0x47, &tmp); - if (tmp & (2 >> ap->port_no)) - ap->cbl = ATA_CBL_PATA40; - else - ap->cbl = ATA_CBL_PATA80; return ata_std_prereset(ap); } @@ -67,6 +59,25 @@ static void efar_error_handler(struct at } /** + * efar_cable_detect - check for 40/80 pin + * @ap: Port + * + * Perform cable detection for the EFAR ATA interface. This is + * different to the PIIX arrangement + */ + +static int efar_cable_detect(struct ata_port *ap) +{ + struct pci_dev *pdev = to_pci_dev(ap->host->dev); + u8 tmp; + + pci_read_config_byte(pdev, 0x47, &tmp); + if (tmp & (2 >> ap->port_no)) + return ATA_CBL_PATA40; + return ATA_CBL_PATA80; +} + +/** * efar_set_piomode - Initialize host controller PATA PIO timings * @ap: Port whose timings we are configuring * @adev: um @@ -256,6 +267,7 @@ static const struct ata_port_operations .thaw = ata_bmdma_thaw, .error_handler = efar_error_handler, .post_internal_cmd = ata_bmdma_post_internal_cmd, + .cable_detect = efar_cable_detect, .bmdma_setup = ata_bmdma_setup, .bmdma_start = ata_bmdma_start, _ Patches currently in -mm which might be from alan@xxxxxxxxxxxxxxxxxxx are git-libata-all.patch expose-set_mode-method-so-it-can-be-wrapped.patch pcmcia-spot-slave-decode-flaws-for-testing.patch pata_platform-set-a-cable-type-which-to-set.patch pata_qdi-set-cable-type.patch pata_sl82c105-missing-methods-cable.patch pata_isapnp-set-cable-type.patch pata_legacy-fix-missing-methods-and-add-cable-types.patch pata_sc1200-set-cable-type-add-freeze-thaw-methods.patch pata_winbond-set-cable-type.patch ata_piix-remove-ugly-layering-violation.patch pata_mpc52xx-cable-detect.patch pata_mpiix-cable-detect-method.patch pata_ns87410-cable-detect-method.patch pata_oldpiix-cable-detect.patch pata_opti-cable-detect.patch pata_pcmcia-cable-detect.patch pata_triflex-cable-detect.patch pata_cmd640-multiple-updates.patch pata_efar-switch-to-cable_detect-method.patch pata_it8213-cable-detect.patch pata_marvell-cable-and-reset-fixes.patch pata_serverworks-cable-detect-and-comment-fix.patch pata_sis-clean-up-using-cable_detect-methods.patch pata_via-use-cable_detect-method.patch pata_hpt366-cable-detect-methods.patch pata_atiixp-switch-to-cable_detect-method-with-correct.patch libata-fix-hopefully-all-the-remaining-problems-with.patch dilnetpc-fix-warning.patch resend-iphase-64bit-cleanup.patch serial-suppress-rts-assertion-with-disabled-crtscts.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 z85230-fix-fifo-handling.patch driver_bfin_serial_core.patch driver_bfin_serial_core-update.patch documentation-ask-driver-writers-to-provide-pm-support.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