diff options
author | Christoph Hellwig <hch@lst.de> | 2005-08-15 07:28:46 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-08-15 10:18:55 -0400 |
commit | 85a46523ff68aa0e4d2477c51075ffd9fc7e7a14 (patch) | |
tree | c465c274ffe0e4118ed46ad4e0e09dca975aeb1f /drivers/scsi/aic7xxx/aic79xx_osm.h | |
parent | d46b1d549e1414d673e0ec18219f4f5e30d5f3f5 (diff) |
[SCSI] aic79xx: sane pci probing
remove ahd_tailq and do sane pci probing. ported over from aic7xxx.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aic7xxx/aic79xx_osm.h')
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_osm.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h index 296d3a59efe9..052c6619accc 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.h +++ b/drivers/scsi/aic7xxx/aic79xx_osm.h | |||
@@ -120,7 +120,6 @@ typedef struct scsi_cmnd *ahd_io_ctx_t; | |||
120 | 120 | ||
121 | /************************* Configuration Data *********************************/ | 121 | /************************* Configuration Data *********************************/ |
122 | extern uint32_t aic79xx_allow_memio; | 122 | extern uint32_t aic79xx_allow_memio; |
123 | extern int aic79xx_detect_complete; | ||
124 | extern struct scsi_host_template aic79xx_driver_template; | 123 | extern struct scsi_host_template aic79xx_driver_template; |
125 | 124 | ||
126 | /***************************** Bus Space/DMA **********************************/ | 125 | /***************************** Bus Space/DMA **********************************/ |
@@ -532,17 +531,6 @@ void ahd_format_transinfo(struct info_str *info, | |||
532 | struct ahd_transinfo *tinfo); | 531 | struct ahd_transinfo *tinfo); |
533 | 532 | ||
534 | /******************************** Locking *************************************/ | 533 | /******************************** Locking *************************************/ |
535 | /* Lock protecting internal data structures */ | ||
536 | static __inline void ahd_lockinit(struct ahd_softc *); | ||
537 | static __inline void ahd_lock(struct ahd_softc *, unsigned long *flags); | ||
538 | static __inline void ahd_unlock(struct ahd_softc *, unsigned long *flags); | ||
539 | |||
540 | /* Lock held during ahd_list manipulation and ahd softc frees */ | ||
541 | extern spinlock_t ahd_list_spinlock; | ||
542 | static __inline void ahd_list_lockinit(void); | ||
543 | static __inline void ahd_list_lock(unsigned long *flags); | ||
544 | static __inline void ahd_list_unlock(unsigned long *flags); | ||
545 | |||
546 | static __inline void | 534 | static __inline void |
547 | ahd_lockinit(struct ahd_softc *ahd) | 535 | ahd_lockinit(struct ahd_softc *ahd) |
548 | { | 536 | { |
@@ -561,24 +549,6 @@ ahd_unlock(struct ahd_softc *ahd, unsigned long *flags) | |||
561 | spin_unlock_irqrestore(&ahd->platform_data->spin_lock, *flags); | 549 | spin_unlock_irqrestore(&ahd->platform_data->spin_lock, *flags); |
562 | } | 550 | } |
563 | 551 | ||
564 | static __inline void | ||
565 | ahd_list_lockinit(void) | ||
566 | { | ||
567 | spin_lock_init(&ahd_list_spinlock); | ||
568 | } | ||
569 | |||
570 | static __inline void | ||
571 | ahd_list_lock(unsigned long *flags) | ||
572 | { | ||
573 | spin_lock_irqsave(&ahd_list_spinlock, *flags); | ||
574 | } | ||
575 | |||
576 | static __inline void | ||
577 | ahd_list_unlock(unsigned long *flags) | ||
578 | { | ||
579 | spin_unlock_irqrestore(&ahd_list_spinlock, *flags); | ||
580 | } | ||
581 | |||
582 | /******************************* PCI Definitions ******************************/ | 552 | /******************************* PCI Definitions ******************************/ |
583 | /* | 553 | /* |
584 | * PCIM_xxx: mask to locate subfield in register | 554 | * PCIM_xxx: mask to locate subfield in register |