git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
perf_events, x86: Remove superflous MSR writes
[safe/jmp/linux-2.6]
/
drivers
/
ata
/
pata_serverworks.c
diff --git
a/drivers/ata/pata_serverworks.c
b/drivers/ata/pata_serverworks.c
index
2f4f9b0
..
beaed12
100644
(file)
--- a/
drivers/ata/pata_serverworks.c
+++ b/
drivers/ata/pata_serverworks.c
@@
-1,7
+1,6
@@
/*
* pata_serverworks.c - Serverworks PATA for new ATA layer
* (C) 2005 Red Hat Inc
/*
* pata_serverworks.c - Serverworks PATA for new ATA layer
* (C) 2005 Red Hat Inc
- * Alan Cox <alan@redhat.com>
*
* based upon
*
*
* based upon
*
@@
-139,7
+138,6
@@
static struct sv_cable_table cable_detect[] = {
/**
* serverworks_cable_detect - cable detection
* @ap: ATA port
/**
* serverworks_cable_detect - cable detection
* @ap: ATA port
- * @deadline: deadline jiffies for the operation
*
* Perform cable detection according to the device and subvendor
* identifications
*
* Perform cable detection according to the device and subvendor
* identifications
@@
-199,7
+197,7
@@
static unsigned long serverworks_osb4_filter(struct ata_device *adev, unsigned l
{
if (adev->class == ATA_DEV_ATA)
mask &= ~ATA_MASK_UDMA;
{
if (adev->class == ATA_DEV_ATA)
mask &= ~ATA_MASK_UDMA;
- return ata_
pci_default
_filter(adev, mask);
+ return ata_
bmdma_mode
_filter(adev, mask);
}
}
@@
-219,7
+217,7
@@
static unsigned long serverworks_csb_filter(struct ata_device *adev, unsigned lo
/* Disk, UDMA */
if (adev->class != ATA_DEV_ATA)
/* Disk, UDMA */
if (adev->class != ATA_DEV_ATA)
- return ata_
pci_default
_filter(adev, mask);
+ return ata_
bmdma_mode
_filter(adev, mask);
/* Actually do need to check */
ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num));
/* Actually do need to check */
ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num));
@@
-228,7
+226,7
@@
static unsigned long serverworks_csb_filter(struct ata_device *adev, unsigned lo
if (!strcmp(p, model_num))
mask &= ~(0xE0 << ATA_SHIFT_UDMA);
}
if (!strcmp(p, model_num))
mask &= ~(0xE0 << ATA_SHIFT_UDMA);
}
- return ata_
pci_default
_filter(adev, mask);
+ return ata_
bmdma_mode
_filter(adev, mask);
}
/**
}
/**
@@
-400,26
+398,26
@@
static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id
static const struct ata_port_info info[4] = {
{ /* OSB4 */
.flags = ATA_FLAG_SLAVE_POSS,
static const struct ata_port_info info[4] = {
{ /* OSB4 */
.flags = ATA_FLAG_SLAVE_POSS,
- .pio_mask =
0x1f
,
- .mwdma_mask =
0x07
,
- .udma_mask =
0x07
,
+ .pio_mask =
ATA_PIO4
,
+ .mwdma_mask =
ATA_MWDMA2
,
+ .udma_mask =
ATA_UDMA2
,
.port_ops = &serverworks_osb4_port_ops
}, { /* OSB4 no UDMA */
.flags = ATA_FLAG_SLAVE_POSS,
.port_ops = &serverworks_osb4_port_ops
}, { /* OSB4 no UDMA */
.flags = ATA_FLAG_SLAVE_POSS,
- .pio_mask =
0x1f
,
- .mwdma_mask =
0x07
,
- .udma_mask = 0x00,
+ .pio_mask =
ATA_PIO4
,
+ .mwdma_mask =
ATA_MWDMA2
,
+ /* No UDMA */
.port_ops = &serverworks_osb4_port_ops
}, { /* CSB5 */
.flags = ATA_FLAG_SLAVE_POSS,
.port_ops = &serverworks_osb4_port_ops
}, { /* CSB5 */
.flags = ATA_FLAG_SLAVE_POSS,
- .pio_mask =
0x1f
,
- .mwdma_mask =
0x07
,
+ .pio_mask =
ATA_PIO4
,
+ .mwdma_mask =
ATA_MWDMA2
,
.udma_mask = ATA_UDMA4,
.port_ops = &serverworks_csb_port_ops
}, { /* CSB5 - later revisions*/
.flags = ATA_FLAG_SLAVE_POSS,
.udma_mask = ATA_UDMA4,
.port_ops = &serverworks_csb_port_ops
}, { /* CSB5 - later revisions*/
.flags = ATA_FLAG_SLAVE_POSS,
- .pio_mask =
0x1f
,
- .mwdma_mask =
0x07
,
+ .pio_mask =
ATA_PIO4
,
+ .mwdma_mask =
ATA_MWDMA2
,
.udma_mask = ATA_UDMA5,
.port_ops = &serverworks_csb_port_ops
}
.udma_mask = ATA_UDMA5,
.port_ops = &serverworks_csb_port_ops
}
@@
-459,9
+457,9
@@
static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id
serverworks_fixup_ht1000(pdev);
if (pdev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5IDE)
serverworks_fixup_ht1000(pdev);
if (pdev->device == PCI_DEVICE_ID_SERVERWORKS_CSB5IDE)
- ata_pci_clear_simplex(pdev);
+ ata_pci_
bmdma_
clear_simplex(pdev);
- return ata_pci_init_one(pdev, ppi, &serverworks_sht, NULL);
+ return ata_pci_
sff_
init_one(pdev, ppi, &serverworks_sht, NULL);
}
#ifdef CONFIG_PM
}
#ifdef CONFIG_PM
@@
-482,7
+480,7
@@
static int serverworks_reinit_one(struct pci_dev *pdev)
serverworks_fixup_osb4(pdev);
break;
case PCI_DEVICE_ID_SERVERWORKS_CSB5IDE:
serverworks_fixup_osb4(pdev);
break;
case PCI_DEVICE_ID_SERVERWORKS_CSB5IDE:
- ata_pci_clear_simplex(pdev);
+ ata_pci_
bmdma_
clear_simplex(pdev);
/* fall through */
case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE:
case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2:
/* fall through */
case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE:
case PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2: