diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@trik.(none)> | 2004-12-30 22:29:23 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@trik.(none)> | 2004-12-30 22:29:23 +0100 |
| commit | 5b9470dbbe1c074ecf9a30934fa7b2f25b1182f3 (patch) | |
| tree | a99bb8c5a16d36c3322111b4953dda91388a3486 /include/linux | |
| parent | 9a2f7ca45319d80fea395bc33205bedf48dd8cee (diff) | |
[ide] make host drivers aware of the changes made to ide_setup_pci_device{s}
- nothing clever here: the most noticeable change is the change of
returned value for (*init_setup) in struct ide_pci_device_s which
goes from void to int. Anything else is editing and checking for
errors in the output of the compiler;
- pci_disable_device() added for the error path in pci_init_sgiioc4();
- BUG() removed in amd74xx_probe(): good old printk() is enough.
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 04f07af5b6d6..f11d04d235f2 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1422,7 +1422,7 @@ enum { typedef struct ide_pci_device_s { char *name; - void (*init_setup)(struct pci_dev *, struct ide_pci_device_s *); + int (*init_setup)(struct pci_dev *, struct ide_pci_device_s *); void (*init_setup_dma)(struct pci_dev *, struct ide_pci_device_s *, ide_hwif_t *); unsigned int (*init_chipset)(struct pci_dev *, const char *); void (*init_iops)(ide_hwif_t *); |