diff options
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r-- | include/linux/ide.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index f27f130ba000..ee2f461882ad 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -37,6 +37,7 @@ typedef unsigned char byte; /* used everywhere */ | |||
37 | /* | 37 | /* |
38 | * Probably not wise to fiddle with these | 38 | * Probably not wise to fiddle with these |
39 | */ | 39 | */ |
40 | #define IDE_DEFAULT_MAX_FAILURES 1 | ||
40 | #define ERROR_MAX 8 /* Max read/write errors per sector */ | 41 | #define ERROR_MAX 8 /* Max read/write errors per sector */ |
41 | #define ERROR_RESET 3 /* Reset controller every 4th retry */ | 42 | #define ERROR_RESET 3 /* Reset controller every 4th retry */ |
42 | #define ERROR_RECAL 1 /* Recalibrate every 2nd retry */ | 43 | #define ERROR_RECAL 1 /* Recalibrate every 2nd retry */ |
@@ -184,9 +185,6 @@ typedef struct hw_regs_s { | |||
184 | unsigned long config; | 185 | unsigned long config; |
185 | } hw_regs_t; | 186 | } hw_regs_t; |
186 | 187 | ||
187 | void ide_init_port_data(struct hwif_s *, unsigned int); | ||
188 | void ide_init_port_hw(struct hwif_s *, hw_regs_t *); | ||
189 | |||
190 | static inline void ide_std_init_ports(hw_regs_t *hw, | 188 | static inline void ide_std_init_ports(hw_regs_t *hw, |
191 | unsigned long io_addr, | 189 | unsigned long io_addr, |
192 | unsigned long ctl_addr) | 190 | unsigned long ctl_addr) |
@@ -1506,8 +1504,6 @@ static inline void ide_acpi_port_init_devices(ide_hwif_t *hwif) { ; } | |||
1506 | static inline void ide_acpi_set_state(ide_hwif_t *hwif, int on) {} | 1504 | static inline void ide_acpi_set_state(ide_hwif_t *hwif, int on) {} |
1507 | #endif | 1505 | #endif |
1508 | 1506 | ||
1509 | void ide_unregister(ide_hwif_t *); | ||
1510 | |||
1511 | void ide_register_region(struct gendisk *); | 1507 | void ide_register_region(struct gendisk *); |
1512 | void ide_unregister_region(struct gendisk *); | 1508 | void ide_unregister_region(struct gendisk *); |
1513 | 1509 | ||
@@ -1592,9 +1588,6 @@ static inline void ide_set_max_pio(ide_drive_t *drive) | |||
1592 | ide_set_pio(drive, 255); | 1588 | ide_set_pio(drive, 255); |
1593 | } | 1589 | } |
1594 | 1590 | ||
1595 | extern spinlock_t ide_lock; | ||
1596 | extern struct mutex ide_cfg_mtx; | ||
1597 | |||
1598 | #define local_irq_set(flags) do { local_save_flags((flags)); local_irq_enable_in_hardirq(); } while (0) | 1591 | #define local_irq_set(flags) do { local_save_flags((flags)); local_irq_enable_in_hardirq(); } while (0) |
1599 | 1592 | ||
1600 | char *ide_media_string(ide_drive_t *); | 1593 | char *ide_media_string(ide_drive_t *); |