Commit 97cb81c3 authored by Alan Cox's avatar Alan Cox Committed by Jeff Garzik
Browse files

pata_via: Use cable_detect method 



We end up shifting a few bits of logic around in this driver but the
basic change is the same.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 2e413f51

drivers/ata/pata_via.c

+12 −15
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
#include <linux/libata.h>



#define DRV_NAME "pata_via"

#define DRV_VERSION "0.2.1"

#define DRV_VERSION "0.3.1"



/*

 *	The following comes directly from Vojtech Pavlik's ide/pci/via82cxxx
@@ -135,15 +135,22 @@ static const struct via_isa_bridge { 
 */



static int via_cable_detect(struct ata_port *ap) {

	const struct via_isa_bridge *config = ap->host->private_data;

	struct pci_dev *pdev = to_pci_dev(ap->host->dev);

	u32 ata66;



	/* Early chips are 40 wire */

	if ((config->flags & VIA_UDMA) < VIA_UDMA_66)

		return ATA_CBL_PATA40;

	/* UDMA 66 chips have only drive side logic */

	else if((config->flags & VIA_UDMA) < VIA_UDMA_100)

		return ATA_CBL_PATA_UNK;

	/* UDMA 100 or later */

	pci_read_config_dword(pdev, 0x50, &ata66);

	/* Check both the drive cable reporting bits, we might not have

	   two drives */

	if (ata66 & (0x10100000 >> (16 * ap->port_no)))

		return ATA_CBL_PATA80;

	else

	return ATA_CBL_PATA40;

}
@@ -156,22 +163,10 @@ static int via_pre_reset(struct ata_port *ap) 
			{ 0x40, 1, 0x02, 0x02 },

			{ 0x40, 1, 0x01, 0x01 }

		};



		struct pci_dev *pdev = to_pci_dev(ap->host->dev);



		if (!pci_test_config_bits(pdev, &via_enable_bits[ap->port_no]))

			return -ENOENT;

	}



	if ((config->flags & VIA_UDMA) >= VIA_UDMA_100)

		ap->cbl = via_cable_detect(ap);

	/* The UDMA66 series has no cable detect so do drive side detect */

	else if ((config->flags & VIA_UDMA) < VIA_UDMA_66)

		ap->cbl = ATA_CBL_PATA40;

	else

		ap->cbl = ATA_CBL_PATA_UNK;





	return ata_std_prereset(ap);

}
@@ -327,6 +322,7 @@ static struct ata_port_operations via_port_ops = { 
	.thaw		= ata_bmdma_thaw,

	.error_handler	= via_error_handler,

	.post_internal_cmd = ata_bmdma_post_internal_cmd,

	.cable_detect	= via_cable_detect,



	.bmdma_setup 	= ata_bmdma_setup,

	.bmdma_start 	= ata_bmdma_start,
@@ -362,6 +358,7 @@ static struct ata_port_operations via_port_ops_noirq = { 
	.thaw		= ata_bmdma_thaw,

	.error_handler	= via_error_handler,

	.post_internal_cmd = ata_bmdma_post_internal_cmd,

	.cable_detect	= via_cable_detect,



	.bmdma_setup 	= ata_bmdma_setup,

	.bmdma_start 	= ata_bmdma_start,