diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 16:53:14 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-24 16:53:14 -0400 |
commit | 6cdf6eb357c2681596b7b1672b92396ba82333d4 (patch) | |
tree | a6194373c64616ecb3d1af2c9247a32f50543f97 /include | |
parent | 8c2eece50a368c7986bae0b3e52739558dd71b51 (diff) |
ide: add ->dev and ->host_priv fields to struct ide_host
* Add 'struct device *dev[2]' and 'void *host_priv' fields
to struct ide_host.
* Set ->dev[] in ide_host_alloc_all()/ide_setup_pci_device[s]().
* Pass 'void *priv' argument to ide_setup_pci_device[s]()
and use it to set ->host_priv.
* Set PCI dev's ->driver_data to point to the struct ide_host
instance if PCI host driver wants to use ->host_priv.
* Rename ide_setup_pci_device[s]() to ide_pci_init_{one,two}().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ide.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index d67ccca2b964..776c574c9640 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -626,6 +626,8 @@ typedef struct hwif_s { | |||
626 | struct ide_host { | 626 | struct ide_host { |
627 | ide_hwif_t *ports[MAX_HWIFS]; | 627 | ide_hwif_t *ports[MAX_HWIFS]; |
628 | unsigned int n_ports; | 628 | unsigned int n_ports; |
629 | struct device *dev[2]; | ||
630 | void *host_priv; | ||
629 | }; | 631 | }; |
630 | 632 | ||
631 | /* | 633 | /* |
@@ -1201,8 +1203,9 @@ struct ide_port_info { | |||
1201 | u8 udma_mask; | 1203 | u8 udma_mask; |
1202 | }; | 1204 | }; |
1203 | 1205 | ||
1204 | int ide_setup_pci_device(struct pci_dev *, const struct ide_port_info *); | 1206 | int ide_pci_init_one(struct pci_dev *, const struct ide_port_info *, void *); |
1205 | int ide_setup_pci_devices(struct pci_dev *, struct pci_dev *, const struct ide_port_info *); | 1207 | int ide_pci_init_two(struct pci_dev *, struct pci_dev *, |
1208 | const struct ide_port_info *, void *); | ||
1206 | 1209 | ||
1207 | void ide_map_sg(ide_drive_t *, struct request *); | 1210 | void ide_map_sg(ide_drive_t *, struct request *); |
1208 | void ide_init_sg_cmd(ide_drive_t *, struct request *); | 1211 | void ide_init_sg_cmd(ide_drive_t *, struct request *); |