Skip to content

Commit

Permalink
ide: add 'config' field to hw_regs_t
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Jul 23, 2008
1 parent edc74b2 commit d6276b5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/ide/ide-probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
1 change: 1 addition & 0 deletions drivers/ide/ide.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/*
Expand Down
1 change: 1 addition & 0 deletions include/linux/ide.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit d6276b5

Please sign in to comment.