[PATCH] pata_oldpiix: cable detect

[PATCH] pata_oldpiix: cable detect

[Alan Cox]

Signed-off-by: Alan Cox <alan@redhat.com>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc2-mm2/drivers/ata/pata_oldpiix.c linux-2.6.21-rc2-mm2/drivers/ata/pata_oldpiix.c
--- linux.vanilla-2.6.21-rc2-mm2/drivers/ata/pata_oldpiix.c	2007-03-06 23:09:46.000000000 +0000
+++ linux-2.6.21-rc2-mm2/drivers/ata/pata_oldpiix.c	2007-03-06 23:36:02.000000000 +0000
@@ -25,7 +25,7 @@
 #include <linux/ata.h>
 
 #define DRV_NAME	"pata_oldpiix"
-#define DRV_VERSION	"0.5.4"
+#define DRV_VERSION	"0.5.5"
 
 /**
  *	oldpiix_pre_reset		-	probe begin
@@ -44,7 +44,6 @@
 
 	if (!pci_test_config_bits(pdev, &oldpiix_enable_bits[ap->port_no]))
 		return -ENOENT;
-	ap->cbl = ATA_CBL_PATA40;
 	return ata_std_prereset(ap);
 }
 
@@ -65,7 +64,7 @@
 /**
  *	oldpiix_set_piomode - Initialize host controller PATA PIO timings
  *	@ap: Port whose timings we are configuring
- *	@adev: um
+ *	@adev: Device whose timings we are configuring
  *
  *	Set PIO mode for device, in host controller PCI config space.
  *
@@ -255,6 +254,7 @@
 	.thaw			= ata_bmdma_thaw,
 	.error_handler		= oldpiix_pata_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,

Re: [PATCH] pata_oldpiix: cable detect

[Jeff Garzik]

Alan Cox wrote:
> Signed-off-by: Alan Cox <alan@redhat.com>
> 
> diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc2-mm2/drivers/ata/pata_oldpiix.c linux-2.6.21-rc2-mm2/drivers/ata/pata_oldpiix.c
> --- linux.vanilla-2.6.21-rc2-mm2/drivers/ata/pata_oldpiix.c	2007-03-06 23:09:46.000000000 +0000
> +++ linux-2.6.21-rc2-mm2/drivers/ata/pata_oldpiix.c	2007-03-06 23:36:02.000000000 +0000
> @@ -25,7 +25,7 @@
>  #include <linux/ata.h>
>  
>  #define DRV_NAME	"pata_oldpiix"
> -#define DRV_VERSION	"0.5.4"
> +#define DRV_VERSION	"0.5.5"
>  
>  /**
>   *	oldpiix_pre_reset		-	probe begin
> @@ -44,7 +44,6 @@
>  
>  	if (!pci_test_config_bits(pdev, &oldpiix_enable_bits[ap->port_no]))
>  		return -ENOENT;
> -	ap->cbl = ATA_CBL_PATA40;
>  	return ata_std_prereset(ap);
>  }
>  
> @@ -65,7 +64,7 @@
>  /**
>   *	oldpiix_set_piomode - Initialize host controller PATA PIO timings
>   *	@ap: Port whose timings we are configuring
> - *	@adev: um
> + *	@adev: Device whose timings we are configuring
>   *
>   *	Set PIO mode for device, in host controller PCI config space.
>   *
> @@ -255,6 +254,7 @@
>  	.thaw			= ata_bmdma_thaw,
>  	.error_handler		= oldpiix_pata_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,

applied, as part of a jumbo ->cable_detect patch, since this patch 
contained changes highly similar to others it was applied alongside.

and ditto for the following ->cable_detect patches sent on 03/07/2007: 
pata_opti, pata_pcmcia, pata_pdc202xx_old, pata_sil680, pata_triflex, 
sata_via, pata_serverworks