diff options
Diffstat (limited to 'drivers/scsi/aic7xxx/aic7xxx_osm.h')
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h index f2a95447142c..e0edacae895f 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.h +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h | |||
@@ -223,9 +223,6 @@ int ahc_dmamap_unload(struct ahc_softc *, bus_dma_tag_t, bus_dmamap_t); | |||
223 | */ | 223 | */ |
224 | #define ahc_dmamap_sync(ahc, dma_tag, dmamap, offset, len, op) | 224 | #define ahc_dmamap_sync(ahc, dma_tag, dmamap, offset, len, op) |
225 | 225 | ||
226 | /************************** Timer DataStructures ******************************/ | ||
227 | typedef struct timer_list ahc_timer_t; | ||
228 | |||
229 | /********************************** Includes **********************************/ | 226 | /********************************** Includes **********************************/ |
230 | #ifdef CONFIG_AIC7XXX_REG_PRETTY_PRINT | 227 | #ifdef CONFIG_AIC7XXX_REG_PRETTY_PRINT |
231 | #define AIC_DEBUG_REGISTERS 1 | 228 | #define AIC_DEBUG_REGISTERS 1 |
@@ -235,30 +232,9 @@ typedef struct timer_list ahc_timer_t; | |||
235 | #include "aic7xxx.h" | 232 | #include "aic7xxx.h" |
236 | 233 | ||
237 | /***************************** Timer Facilities *******************************/ | 234 | /***************************** Timer Facilities *******************************/ |
238 | #define ahc_timer_init init_timer | ||
239 | #define ahc_timer_stop del_timer_sync | ||
240 | typedef void ahc_linux_callback_t (u_long); | ||
241 | static __inline void ahc_timer_reset(ahc_timer_t *timer, int usec, | ||
242 | ahc_callback_t *func, void *arg); | ||
243 | static __inline void ahc_scb_timer_reset(struct scb *scb, u_int usec); | ||
244 | |||
245 | static __inline void | ||
246 | ahc_timer_reset(ahc_timer_t *timer, int usec, ahc_callback_t *func, void *arg) | ||
247 | { | ||
248 | struct ahc_softc *ahc; | ||
249 | |||
250 | ahc = (struct ahc_softc *)arg; | ||
251 | del_timer(timer); | ||
252 | timer->data = (u_long)arg; | ||
253 | timer->expires = jiffies + (usec * HZ)/1000000; | ||
254 | timer->function = (ahc_linux_callback_t*)func; | ||
255 | add_timer(timer); | ||
256 | } | ||
257 | |||
258 | static __inline void | 235 | static __inline void |
259 | ahc_scb_timer_reset(struct scb *scb, u_int usec) | 236 | ahc_scb_timer_reset(struct scb *scb, u_int usec) |
260 | { | 237 | { |
261 | mod_timer(&scb->io_ctx->eh_timeout, jiffies + (usec * HZ)/1000000); | ||
262 | } | 238 | } |
263 | 239 | ||
264 | /***************************** SMP support ************************************/ | 240 | /***************************** SMP support ************************************/ |
@@ -393,7 +369,6 @@ struct ahc_platform_data { | |||
393 | 369 | ||
394 | spinlock_t spin_lock; | 370 | spinlock_t spin_lock; |
395 | u_int qfrozen; | 371 | u_int qfrozen; |
396 | struct timer_list reset_timer; | ||
397 | struct semaphore eh_sem; | 372 | struct semaphore eh_sem; |
398 | struct Scsi_Host *host; /* pointer to scsi host */ | 373 | struct Scsi_Host *host; /* pointer to scsi host */ |
399 | #define AHC_LINUX_NOIRQ ((uint32_t)~0) | 374 | #define AHC_LINUX_NOIRQ ((uint32_t)~0) |