diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 11:36:36 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-26 11:36:36 -0400 |
commit | fe80b937c9917887e4fbfaaf52f498b5ac3a6999 (patch) | |
tree | 4943f2d8f7157437f100bfcdf8aed88f6dcffef1 /include/linux/ide.h | |
parent | 078fdf789c4ef13dcb7b5651ff330e325d764c0e (diff) |
ide: merge ide_match_hwif() and ide_find_port()
* Change ide_match_hwif() argument from 'u8 bootable' to
'struct ide_port_info *d'.
* Move ide_match_hwif() to ide-probe.c from setup-pci.c and rename
it to ide_find_port_slot(). Update some comments while at it.
* ide_find_port() can be now just a wrapper for ide_find_port_slot().
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r-- | include/linux/ide.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index c6d4de60185a..2c43766ff344 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -170,7 +170,6 @@ typedef struct hw_regs_s { | |||
170 | struct device *dev; | 170 | struct device *dev; |
171 | } hw_regs_t; | 171 | } hw_regs_t; |
172 | 172 | ||
173 | struct hwif_s *ide_find_port(void); | ||
174 | void ide_init_port_data(struct hwif_s *, unsigned int); | 173 | void ide_init_port_data(struct hwif_s *, unsigned int); |
175 | void ide_init_port_hw(struct hwif_s *, hw_regs_t *); | 174 | void ide_init_port_hw(struct hwif_s *, hw_regs_t *); |
176 | 175 | ||
@@ -809,6 +808,13 @@ extern ide_hwif_t ide_hwifs[]; /* master data repository */ | |||
809 | #endif | 808 | #endif |
810 | extern int noautodma; | 809 | extern int noautodma; |
811 | 810 | ||
811 | ide_hwif_t *ide_find_port_slot(const struct ide_port_info *); | ||
812 | |||
813 | static inline ide_hwif_t *ide_find_port(void) | ||
814 | { | ||
815 | return ide_find_port_slot(NULL); | ||
816 | } | ||
817 | |||
812 | extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs); | 818 | extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs); |
813 | int ide_end_dequeued_request(ide_drive_t *drive, struct request *rq, | 819 | int ide_end_dequeued_request(ide_drive_t *drive, struct request *rq, |
814 | int uptodate, int nr_sectors); | 820 | int uptodate, int nr_sectors); |