mirror of
https://github.com/torvalds/linux
synced 2024-09-24 05:17:36 +00:00
icside: use struct ide_port_info also for PCB version 5 (v2)
This fixes hwif->channel and drive->dn assignments. v2: Fix v5/v6 mismatch noticed by Russell. Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
be0ea69674
commit
33050ec7a2
|
@ -419,6 +419,10 @@ static void icside_setup_ports(hw_regs_t *hw, void __iomem *base,
|
||||||
hw->chipset = ide_acorn;
|
hw->chipset = ide_acorn;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const struct ide_port_info icside_v5_port_info = {
|
||||||
|
.host_flags = IDE_HFLAG_NO_DMA,
|
||||||
|
};
|
||||||
|
|
||||||
static int __devinit
|
static int __devinit
|
||||||
icside_register_v5(struct icside_state *state, struct expansion_card *ec)
|
icside_register_v5(struct icside_state *state, struct expansion_card *ec)
|
||||||
{
|
{
|
||||||
|
@ -445,7 +449,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
|
||||||
|
|
||||||
icside_setup_ports(&hw, base, &icside_cardinfo_v5, ec);
|
icside_setup_ports(&hw, base, &icside_cardinfo_v5, ec);
|
||||||
|
|
||||||
host = ide_host_alloc(NULL, hws);
|
host = ide_host_alloc(&icside_v5_port_info, hws);
|
||||||
if (host == NULL)
|
if (host == NULL)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
@ -453,7 +457,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
|
||||||
|
|
||||||
ecard_set_drvdata(ec, state);
|
ecard_set_drvdata(ec, state);
|
||||||
|
|
||||||
ret = ide_host_register(host, NULL, hws);
|
ret = ide_host_register(host, &icside_v5_port_info, hws);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_free;
|
goto err_free;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue