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
libata: implement drain buffers
[safe/jmp/linux-2.6]
/
drivers
/
ata
/
pata_optidma.c
diff --git
a/drivers/ata/pata_optidma.c
b/drivers/ata/pata_optidma.c
index
39fcba8
..
f9b485a
100644
(file)
--- a/
drivers/ata/pata_optidma.c
+++ b/
drivers/ata/pata_optidma.c
@@
-324,25
+324,26
@@
static u8 optidma_make_bits43(struct ata_device *adev)
/**
* optidma_set_mode - mode setup
/**
* optidma_set_mode - mode setup
- * @
ap: port
to set up
+ * @
link: link
to set up
*
* Use the standard setup to tune the chipset and then finalise the
* configuration by writing the nibble of extra bits of data into
* the chip.
*/
*
* Use the standard setup to tune the chipset and then finalise the
* configuration by writing the nibble of extra bits of data into
* the chip.
*/
-static int optidma_set_mode(struct ata_
port *ap
, struct ata_device **r_failed)
+static int optidma_set_mode(struct ata_
link *link
, struct ata_device **r_failed)
{
{
+ struct ata_port *ap = link->ap;
u8 r;
int nybble = 4 * ap->port_no;
struct pci_dev *pdev = to_pci_dev(ap->host->dev);
u8 r;
int nybble = 4 * ap->port_no;
struct pci_dev *pdev = to_pci_dev(ap->host->dev);
- int rc = ata_do_set_mode(
ap
, r_failed);
+ int rc = ata_do_set_mode(
link
, r_failed);
if (rc == 0) {
pci_read_config_byte(pdev, 0x43, &r);
r &= (0x0F << nybble);
if (rc == 0) {
pci_read_config_byte(pdev, 0x43, &r);
r &= (0x0F << nybble);
- r |= (optidma_make_bits43(&
ap->link.
device[0]) +
- (optidma_make_bits43(&
ap->link.
device[0]) << 2)) << nybble;
+ r |= (optidma_make_bits43(&
link->
device[0]) +
+ (optidma_make_bits43(&
link->
device[0]) << 2)) << nybble;
pci_write_config_byte(pdev, 0x43, r);
}
return rc;
pci_write_config_byte(pdev, 0x43, r);
}
return rc;
@@
-367,7
+368,6
@@
static struct scsi_host_template optidma_sht = {
};
static struct ata_port_operations optidma_port_ops = {
};
static struct ata_port_operations optidma_port_ops = {
- .port_disable = ata_port_disable,
.set_piomode = optidma_set_pio_mode,
.set_dmamode = optidma_set_dma_mode,
.set_piomode = optidma_set_pio_mode,
.set_dmamode = optidma_set_dma_mode,
@@
-397,13
+397,11
@@
static struct ata_port_operations optidma_port_ops = {
.irq_handler = ata_interrupt,
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,
.irq_handler = ata_interrupt,
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,
- .irq_ack = ata_irq_ack,
- .port_start = ata_port_start,
+ .port_start = ata_
sff_
port_start,
};
static struct ata_port_operations optiplus_port_ops = {
};
static struct ata_port_operations optiplus_port_ops = {
- .port_disable = ata_port_disable,
.set_piomode = optiplus_set_pio_mode,
.set_dmamode = optiplus_set_dma_mode,
.set_piomode = optiplus_set_pio_mode,
.set_dmamode = optiplus_set_dma_mode,
@@
-433,9
+431,8
@@
static struct ata_port_operations optiplus_port_ops = {
.irq_handler = ata_interrupt,
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,
.irq_handler = ata_interrupt,
.irq_clear = ata_bmdma_irq_clear,
.irq_on = ata_irq_on,
- .irq_ack = ata_irq_ack,
- .port_start = ata_port_start,
+ .port_start = ata_
sff_
port_start,
};
/**
};
/**
@@
-452,7
+449,7
@@
static int optiplus_with_udma(struct pci_dev *pdev)
/* Find function 1 */
dev1 = pci_get_device(0x1045, 0xC701, NULL);
/* Find function 1 */
dev1 = pci_get_device(0x1045, 0xC701, NULL);
- if(dev1 == NULL)
+ if
(dev1 == NULL)
return 0;
/* Rev must be >= 0x10 */
return 0;
/* Rev must be >= 0x10 */