vserver 1.9.5.x5

[linux-2.6.git] / drivers / scsi / aic7xxx / aic7xxx_core.c

diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 22944e8..9a6b4a5 100644 (file)
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -3973,7 +3973,6 @@ ahc_free(struct ahc_softc *ahc)
        default:
        case 5:
                ahc_shutdown(ahc);
-               TAILQ_REMOVE(&ahc_tailq, ahc, links);
                /* FALLTHROUGH */
        case 4:
                ahc_dmamap_unload(ahc, ahc->shared_data_dmat,
@@ -4199,9 +4198,9 @@ ahc_probe_scbs(struct ahc_softc *ahc) {
 static void
 ahc_dmamap_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error) 
 {
-       bus_addr_t *baddr;
+       dma_addr_t *baddr;
 
-       baddr = (bus_addr_t *)arg;
+       baddr = (dma_addr_t *)arg;
        *baddr = segs->ds_addr;
 }
 
@@ -4456,7 +4455,7 @@ ahc_alloc_scbs(struct ahc_softc *ahc)
        struct scb_data *scb_data;
        struct scb *next_scb;
        struct sg_map_node *sg_map;
-       bus_addr_t physaddr;
+       dma_addr_t physaddr;
        struct ahc_dma_seg *segs;
        int newcount;
        int i;
@@ -4820,7 +4819,7 @@ ahc_init(struct ahc_softc *ahc)
        if (ahc_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/1,
                               /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
                               /*lowaddr*/ahc->flags & AHC_39BIT_ADDRESSING
-                                       ? (bus_addr_t)0x7FFFFFFFFFULL
+                                       ? (dma_addr_t)0x7FFFFFFFFFULL
                                        : BUS_SPACE_MAXADDR_32BIT,
                               /*highaddr*/BUS_SPACE_MAXADDR,
                               /*filter*/NULL, /*filterarg*/NULL,