aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ide.h
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-19 18:32:31 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-19 18:32:31 -0400
commit8447d9d52adbe4c653482bd0d5ccb9b5d26f9c9d (patch)
tree358aa3ca6b0657623b84e7c6278f90fc95a32879 /include/linux/ide.h
parentfd9bb53942a7ca3398a63f2c238afd8fbed3ec0e (diff)
ide: add ide_device_add()
* Add ide_device_add() helper and convert host drivers to use it instead of open-coded variants. * Make ide_pci_setup_ports() and do_ide_setup_pci_device() take 'u8 *idx' argument instead of 'ata_index_t *index'. * Remove no longer needed ata_index_t. * Unexport probe_hwif_init() and make it static. * Unexport ide_proc_register_port(). There should be no functionality changes caused by this patch (sgiioc4.c: ide_proc_register_port() requires hwif->present to be set and it won't be set if probe_hwif_init() fails). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r--include/linux/ide.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 831b9cc2f1d9..7212fe417726 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -361,7 +361,6 @@ typedef union {
361 * ATA DATA Register Special. 361 * ATA DATA Register Special.
362 * ATA NSECTOR Count Register(). 362 * ATA NSECTOR Count Register().
363 * ATAPI Byte Count Register. 363 * ATAPI Byte Count Register.
364 * Channel index ordering pairs.
365 */ 364 */
366typedef union { 365typedef union {
367 unsigned all :16; 366 unsigned all :16;
@@ -376,7 +375,7 @@ typedef union {
376#error "Please fix <asm/byteorder.h>" 375#error "Please fix <asm/byteorder.h>"
377#endif 376#endif
378 } b; 377 } b;
379} ata_nsector_t, ata_data_t, atapi_bcount_t, ata_index_t; 378} ata_nsector_t, ata_data_t, atapi_bcount_t;
380 379
381/* 380/*
382 * ATA-IDE Select Register, aka Device-Head 381 * ATA-IDE Select Register, aka Device-Head
@@ -1200,7 +1199,7 @@ extern int __ide_pci_register_driver(struct pci_driver *driver, struct module *o
1200#define ide_pci_register_driver(d) pci_register_driver(d) 1199#define ide_pci_register_driver(d) pci_register_driver(d)
1201#endif 1200#endif
1202 1201
1203void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, ata_index_t *); 1202void ide_pci_setup_ports(struct pci_dev *, struct ide_pci_device_s *, int, u8 *);
1204extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d); 1203extern void ide_setup_pci_noise (struct pci_dev *dev, struct ide_pci_device_s *d);
1205 1204
1206extern void default_hwif_iops(ide_hwif_t *); 1205extern void default_hwif_iops(ide_hwif_t *);
@@ -1378,7 +1377,7 @@ void ide_unregister_region(struct gendisk *);
1378 1377
1379void ide_undecoded_slave(ide_hwif_t *); 1378void ide_undecoded_slave(ide_hwif_t *);
1380 1379
1381extern int probe_hwif_init(ide_hwif_t *); 1380int ide_device_add(u8 idx[4]);
1382 1381
1383static inline void *ide_get_hwifdata (ide_hwif_t * hwif) 1382static inline void *ide_get_hwifdata (ide_hwif_t * hwif)
1384{ 1383{