diff options
Diffstat (limited to 'drivers/scsi/aic7xxx/aic7xxx_osm.h')
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h index 8ffe2d3e1d95..0e47ac217549 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.h +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h | |||
@@ -132,7 +132,6 @@ typedef struct scsi_cmnd *ahc_io_ctx_t; | |||
132 | /************************* Configuration Data *********************************/ | 132 | /************************* Configuration Data *********************************/ |
133 | extern u_int aic7xxx_no_probe; | 133 | extern u_int aic7xxx_no_probe; |
134 | extern u_int aic7xxx_allow_memio; | 134 | extern u_int aic7xxx_allow_memio; |
135 | extern int aic7xxx_detect_complete; | ||
136 | extern struct scsi_host_template aic7xxx_driver_template; | 135 | extern struct scsi_host_template aic7xxx_driver_template; |
137 | 136 | ||
138 | /***************************** Bus Space/DMA **********************************/ | 137 | /***************************** Bus Space/DMA **********************************/ |
@@ -510,15 +509,6 @@ void ahc_format_transinfo(struct info_str *info, | |||
510 | 509 | ||
511 | /******************************** Locking *************************************/ | 510 | /******************************** Locking *************************************/ |
512 | /* Lock protecting internal data structures */ | 511 | /* Lock protecting internal data structures */ |
513 | static __inline void ahc_lockinit(struct ahc_softc *); | ||
514 | static __inline void ahc_lock(struct ahc_softc *, unsigned long *flags); | ||
515 | static __inline void ahc_unlock(struct ahc_softc *, unsigned long *flags); | ||
516 | |||
517 | /* Lock held during ahc_list manipulation and ahc softc frees */ | ||
518 | extern spinlock_t ahc_list_spinlock; | ||
519 | static __inline void ahc_list_lockinit(void); | ||
520 | static __inline void ahc_list_lock(unsigned long *flags); | ||
521 | static __inline void ahc_list_unlock(unsigned long *flags); | ||
522 | 512 | ||
523 | static __inline void | 513 | static __inline void |
524 | ahc_lockinit(struct ahc_softc *ahc) | 514 | ahc_lockinit(struct ahc_softc *ahc) |
@@ -538,24 +528,6 @@ ahc_unlock(struct ahc_softc *ahc, unsigned long *flags) | |||
538 | spin_unlock_irqrestore(&ahc->platform_data->spin_lock, *flags); | 528 | spin_unlock_irqrestore(&ahc->platform_data->spin_lock, *flags); |
539 | } | 529 | } |
540 | 530 | ||
541 | static __inline void | ||
542 | ahc_list_lockinit(void) | ||
543 | { | ||
544 | spin_lock_init(&ahc_list_spinlock); | ||
545 | } | ||
546 | |||
547 | static __inline void | ||
548 | ahc_list_lock(unsigned long *flags) | ||
549 | { | ||
550 | spin_lock_irqsave(&ahc_list_spinlock, *flags); | ||
551 | } | ||
552 | |||
553 | static __inline void | ||
554 | ahc_list_unlock(unsigned long *flags) | ||
555 | { | ||
556 | spin_unlock_irqrestore(&ahc_list_spinlock, *flags); | ||
557 | } | ||
558 | |||
559 | /******************************* PCI Definitions ******************************/ | 531 | /******************************* PCI Definitions ******************************/ |
560 | /* | 532 | /* |
561 | * PCIM_xxx: mask to locate subfield in register | 533 | * PCIM_xxx: mask to locate subfield in register |
@@ -892,7 +864,6 @@ int ahc_platform_abort_scbs(struct ahc_softc *ahc, int target, | |||
892 | irqreturn_t | 864 | irqreturn_t |
893 | ahc_linux_isr(int irq, void *dev_id, struct pt_regs * regs); | 865 | ahc_linux_isr(int irq, void *dev_id, struct pt_regs * regs); |
894 | void ahc_platform_flushwork(struct ahc_softc *ahc); | 866 | void ahc_platform_flushwork(struct ahc_softc *ahc); |
895 | int ahc_softc_comp(struct ahc_softc *, struct ahc_softc *); | ||
896 | void ahc_done(struct ahc_softc*, struct scb*); | 867 | void ahc_done(struct ahc_softc*, struct scb*); |
897 | void ahc_send_async(struct ahc_softc *, char channel, | 868 | void ahc_send_async(struct ahc_softc *, char channel, |
898 | u_int target, u_int lun, ac_code, void *); | 869 | u_int target, u_int lun, ac_code, void *); |