forked from Minki/linux
ide: add 'config' field to hw_regs_t
Add 'config' field to hw_regs_t and use it to set hwif->config_data in ide_init_port_hw(), then convert ide_legacy_init_one() to use hw->config. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
edc74b247b
commit
d6276b5f5c
@ -1689,14 +1689,12 @@ static void ide_legacy_init_one(u8 *idx, hw_regs_t **hws, hw_regs_t *hw,
|
||||
ide_std_init_ports(hw, base, ctl);
|
||||
hw->irq = irq;
|
||||
hw->chipset = d->chipset;
|
||||
hw->config = config;
|
||||
|
||||
hwif = ide_find_port_slot(d);
|
||||
if (hwif) {
|
||||
hwif->chipset = hw->chipset;
|
||||
|
||||
if (config)
|
||||
hwif->config_data = config;
|
||||
|
||||
hws[port_no] = hw;
|
||||
idx[port_no] = hwif->index;
|
||||
}
|
||||
|
@ -286,6 +286,7 @@ void ide_init_port_hw(ide_hwif_t *hwif, hw_regs_t *hw)
|
||||
hwif->dev = hw->dev;
|
||||
hwif->gendev.parent = hw->parent ? hw->parent : hw->dev;
|
||||
hwif->ack_intr = hw->ack_intr;
|
||||
hwif->config_data = hw->config;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -178,6 +178,7 @@ typedef struct hw_regs_s {
|
||||
ide_ack_intr_t *ack_intr; /* acknowledge interrupt */
|
||||
hwif_chipset_t chipset;
|
||||
struct device *dev, *parent;
|
||||
unsigned long config;
|
||||
} hw_regs_t;
|
||||
|
||||
void ide_init_port_data(struct hwif_s *, unsigned int);
|
||||
|
Loading…
Reference in New Issue
Block a user