Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5860a554 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Jeff Garzik
Browse files

pata_serverworks: use standard cable detection methods 



Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 57242762

drivers/ata/pata_serverworks.c

+12 −33
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ static const char *csb_bad_ata100[] = { 
 *	bits of the subsystem ID.

 */



static int dell_cable(struct ata_port *ap) {

static int dell_cable(struct ata_port *ap)

{

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



	if (pdev->subsystem_device & (1 << (ap->port_no + 14)))
@@ -82,7 +83,8 @@ static int dell_cable(struct ata_port *ap) { 
 *	need to extend the Dell one in future

 */



static int sun_cable(struct ata_port *ap) {

static int sun_cable(struct ata_port *ap)

{

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



	if (pdev->subsystem_device & (1 << (ap->port_no + 14)))
@@ -90,29 +92,6 @@ static int sun_cable(struct ata_port *ap) { 
	return ATA_CBL_PATA40;

}



/**

 *	osb4_cable	-	OSB4 cable detect

 *	@ap: ATA port to check

 *

 *	The OSB4 isn't UDMA66 capable so this is easy

 */



static int osb4_cable(struct ata_port *ap) {

	return ATA_CBL_PATA40;

}



/**

 *	csb_cable	-	CSB5/6 cable detect

 *	@ap: ATA port to check

 *

 *	Serverworks default arrangement is to use the drive side detection

 *	only.

 */



static int csb_cable(struct ata_port *ap) {

	return ATA_CBL_PATA_UNK;

}



struct sv_cable_table {

	int device;

	int subvendor;
@@ -128,11 +107,11 @@ static struct sv_cable_table cable_detect[] = { 
	{ PCI_DEVICE_ID_SERVERWORKS_CSB5IDE,   PCI_VENDOR_ID_DELL, dell_cable },

	{ PCI_DEVICE_ID_SERVERWORKS_CSB6IDE,   PCI_VENDOR_ID_DELL, dell_cable },

	{ PCI_DEVICE_ID_SERVERWORKS_CSB5IDE,   PCI_VENDOR_ID_SUN,  sun_cable  },

	{ PCI_DEVICE_ID_SERVERWORKS_OSB4IDE, PCI_ANY_ID, osb4_cable },

	{ PCI_DEVICE_ID_SERVERWORKS_CSB5IDE, PCI_ANY_ID, csb_cable },

	{ PCI_DEVICE_ID_SERVERWORKS_CSB6IDE, PCI_ANY_ID, csb_cable },

	{ PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2, PCI_ANY_ID, csb_cable },

	{ PCI_DEVICE_ID_SERVERWORKS_HT1000IDE, PCI_ANY_ID, csb_cable },

	{ PCI_DEVICE_ID_SERVERWORKS_OSB4IDE,   PCI_ANY_ID, ata_cable_40wire  },

	{ PCI_DEVICE_ID_SERVERWORKS_CSB5IDE,   PCI_ANY_ID, ata_cable_unknown },

	{ PCI_DEVICE_ID_SERVERWORKS_CSB6IDE,   PCI_ANY_ID, ata_cable_unknown },

	{ PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2,  PCI_ANY_ID, ata_cable_unknown },

	{ PCI_DEVICE_ID_SERVERWORKS_HT1000IDE, PCI_ANY_ID, ata_cable_unknown },

	{ }

};