openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

pata_serverworks: Fix cable types and cosmetics 

Minor tidying up. Only real change is to return UNK not 80 wire when we
don't know the cable type. This didn't use to matter but with Tejun's
reworking of cable detection it may.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Alan Cox 2008-01-19 15:52:56 +00:00 committed by Jeff Garzik
parent 0eaea364ed
commit 0f069788c3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/ata/pata_serverworks.c
View File

@ -41,7 +41,7 @@
#include <linux/libata.h> #include <linux/libata.h>
#define DRV_NAME "pata_serverworks" #define DRV_NAME "pata_serverworks"
#define DRV_VERSION "0.4.2" #define DRV_VERSION "0.4.3"
#define SVWKS_CSB5_REVISION_NEW 0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */ #define SVWKS_CSB5_REVISION_NEW 0x92 /* min PCI_REVISION_ID for UDMA5 (A2.0) */
#define SVWKS_CSB6_REVISION 0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */ #define SVWKS_CSB6_REVISION 0xa0 /* min PCI_REVISION_ID for UDMA4 (A1.0) */
@ -102,7 +102,7 @@ static int osb4_cable(struct ata_port *ap) {
} }
/** /**
* csb4_cable - CSB5/6 cable detect * csb_cable - CSB5/6 cable detect
* @ap: ATA port to check * @ap: ATA port to check
* *
* Serverworks default arrangement is to use the drive side detection * Serverworks default arrangement is to use the drive side detection
@ -110,7 +110,7 @@ static int osb4_cable(struct ata_port *ap) {
*/ */
static int csb_cable(struct ata_port *ap) { static int csb_cable(struct ata_port *ap) {
return ATA_CBL_PATA80; return ATA_CBL_PATA_UNK;
} }
struct sv_cable_table { struct sv_cable_table {
@ -231,7 +231,6 @@ static unsigned long serverworks_csb_filter(struct ata_device *adev, unsigned lo
return ata_pci_default_filter(adev, mask); return ata_pci_default_filter(adev, mask);
} }
/** /**
* serverworks_set_piomode - set initial PIO mode data * serverworks_set_piomode - set initial PIO mode data
* @ap: ATA interface * @ap: ATA interface
@ -243,7 +242,7 @@ static unsigned long serverworks_csb_filter(struct ata_device *adev, unsigned lo
static void serverworks_set_piomode(struct ata_port *ap, struct ata_device *adev) static void serverworks_set_piomode(struct ata_port *ap, struct ata_device *adev)
{ {
static const u8 pio_mode[] = { 0x5d, 0x47, 0x34, 0x22, 0x20 }; static const u8 pio_mode[] = { 0x5d, 0x47, 0x34, 0x22, 0x20 };
int offset = 1 + (2 * ap->port_no) - adev->devno; int offset = 1 + 2 * ap->port_no - adev->devno;
int devbits = (2 * ap->port_no + adev->devno) * 4; int devbits = (2 * ap->port_no + adev->devno) * 4;
u16 csb5_pio; u16 csb5_pio;
struct pci_dev *pdev = to_pci_dev(ap->host->dev); struct pci_dev *pdev = to_pci_dev(ap->host->dev);