Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pata_icside build for recent libata API changes

Browse Source 
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Al Viro 2007-10-14 01:12:39 +01:00 committed by Jeff Garzik
parent 0e06d9ce7a
commit c15fcafe1c
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/ata/pata_icside.c
View File

@ -332,12 +332,13 @@ static void ata_dummy_noret(struct ata_port *port)
{ {
} }
static void pata_icside_postreset(struct ata_port *ap, unsigned int *classes) static void pata_icside_postreset(struct ata_link *link, unsigned int *classes)
{ {
struct ata_port *ap = link->ap;
struct pata_icside_state *state = ap->host->private_data; struct pata_icside_state *state = ap->host->private_data;
if (classes[0] != ATA_DEV_NONE || classes[1] != ATA_DEV_NONE) if (classes[0] != ATA_DEV_NONE || classes[1] != ATA_DEV_NONE)
return ata_std_postreset(ap, classes); return ata_std_postreset(link, classes);
state->port[ap->port_no].disabled = 1; state->port[ap->port_no].disabled = 1;
@ -395,29 +396,30 @@ static struct ata_port_operations pata_icside_port_ops = {
static void __devinit static void __devinit
pata_icside_setup_ioaddr(struct ata_port *ap, void __iomem *base, pata_icside_setup_ioaddr(struct ata_port *ap, void __iomem *base,
const struct portinfo *info) struct pata_icside_info *info,
const struct portinfo *port)
{ {
struct ata_ioports *ioaddr = &ap->ioaddr; struct ata_ioports *ioaddr = &ap->ioaddr;
void __iomem *cmd = base + info->dataoffset; void __iomem *cmd = base + port->dataoffset;
ioaddr->cmd_addr = cmd; ioaddr->cmd_addr = cmd;
ioaddr->data_addr = cmd + (ATA_REG_DATA << info->stepping); ioaddr->data_addr = cmd + (ATA_REG_DATA << port->stepping);
ioaddr->error_addr = cmd + (ATA_REG_ERR << info->stepping); ioaddr->error_addr = cmd + (ATA_REG_ERR << port->stepping);
ioaddr->feature_addr = cmd + (ATA_REG_FEATURE << info->stepping); ioaddr->feature_addr = cmd + (ATA_REG_FEATURE << port->stepping);
ioaddr->nsect_addr = cmd + (ATA_REG_NSECT << info->stepping); ioaddr->nsect_addr = cmd + (ATA_REG_NSECT << port->stepping);
ioaddr->lbal_addr = cmd + (ATA_REG_LBAL << info->stepping); ioaddr->lbal_addr = cmd + (ATA_REG_LBAL << port->stepping);
ioaddr->lbam_addr = cmd + (ATA_REG_LBAM << info->stepping); ioaddr->lbam_addr = cmd + (ATA_REG_LBAM << port->stepping);
ioaddr->lbah_addr = cmd + (ATA_REG_LBAH << info->stepping); ioaddr->lbah_addr = cmd + (ATA_REG_LBAH << port->stepping);
ioaddr->device_addr = cmd + (ATA_REG_DEVICE << info->stepping); ioaddr->device_addr = cmd + (ATA_REG_DEVICE << port->stepping);
ioaddr->status_addr = cmd + (ATA_REG_STATUS << info->stepping); ioaddr->status_addr = cmd + (ATA_REG_STATUS << port->stepping);
ioaddr->command_addr = cmd + (ATA_REG_CMD << info->stepping); ioaddr->command_addr = cmd + (ATA_REG_CMD << port->stepping);
ioaddr->ctl_addr = base + info->ctrloffset; ioaddr->ctl_addr = base + port->ctrloffset;
ioaddr->altstatus_addr = ioaddr->ctl_addr; ioaddr->altstatus_addr = ioaddr->ctl_addr;
ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx", ata_port_desc(ap, "cmd 0x%lx ctl 0x%lx",
info->raw_base + info->dataoffset, info->raw_base + port->dataoffset,
info->raw_base + info->ctrloffset); info->raw_base + port->ctrloffset);
if (info->raw_ioc_base) if (info->raw_ioc_base)
ata_port_desc(ap, "iocbase 0x%lx", info->raw_ioc_base); ata_port_desc(ap, "iocbase 0x%lx", info->raw_ioc_base);
@ -441,7 +443,7 @@ static int __devinit pata_icside_register_v5(struct pata_icside_info *info)
info->nr_ports = 1; info->nr_ports = 1;
info->port[0] = &pata_icside_portinfo_v5; info->port[0] = &pata_icside_portinfo_v5;
info->raw_base = ecard_resource_start(ec, ECARD_RES_MEMC); info->raw_base = ecard_resource_start(info->ec, ECARD_RES_MEMC);
return 0; return 0;
} }
@ -522,7 +524,7 @@ static int __devinit pata_icside_add_ports(struct pata_icside_info *info)
ap->flags |= ATA_FLAG_SLAVE_POSS; ap->flags |= ATA_FLAG_SLAVE_POSS;
ap->ops = &pata_icside_port_ops; ap->ops = &pata_icside_port_ops;
pata_icside_setup_ioaddr(ap, info->base, info->port[i]); pata_icside_setup_ioaddr(ap, info->base, info, info->port[i]);
} }
return ata_host_activate(host, ec->irq, ata_interrupt, 0, return ata_host_activate(host, ec->irq, ata_interrupt, 0,