From mboxrd@z Thu Jan 1 00:00:00 1970 From: janitor@sternwelten.at Subject: [patch 03/11] remove old ifdefs aic79xxx Date: Wed, 01 Sep 2004 22:46:10 +0200 Sender: linux-scsi-owner@vger.kernel.org Message-ID: Return-path: Received: from baikonur.stro.at ([213.239.196.228]:7876 "EHLO baikonur.stro.at") by vger.kernel.org with ESMTP id S267777AbUIAUqL (ORCPT ); Wed, 1 Sep 2004 16:46:11 -0400 List-Id: linux-scsi@vger.kernel.org To: linux-scsi@vger.kernel.org Cc: James.Bottomley@SteelEye.com, janitor@sternwelten.at Patches to remove some old ifdefs. remove most of the #include kill compat cruft like #define ahd_pci_set_dma_mask pci_set_dma_mask Signed-off-by: Maximilian Attems --- linux-2.6.9-rc1-bk7-max/drivers/scsi/aic7xxx/aic79xx_inline.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff -puN drivers/scsi/aic7xxx/aic79xx_inline.h~remove-old-ifdefs-aic79xx_inline drivers/scsi/aic7xxx/aic79xx_inline.h --- linux-2.6.9-rc1-bk7/drivers/scsi/aic7xxx/aic79xx_inline.h~remove-old-ifdefs-aic79xx_inline 2004-08-31 17:41:19.000000000 +0200 +++ linux-2.6.9-rc1-bk7-max/drivers/scsi/aic7xxx/aic79xx_inline.h 2004-08-31 17:41:19.000000000 +0200 @@ -231,7 +231,7 @@ ahd_unpause(struct ahd_softc *ahd) /*********************** Scatter Gather List Handling *************************/ static __inline void *ahd_sg_setup(struct ahd_softc *ahd, struct scb *scb, - void *sgptr, bus_addr_t addr, + void *sgptr, dma_addr_t addr, bus_size_t len, int last); static __inline void ahd_setup_scb_common(struct ahd_softc *ahd, struct scb *scb); @@ -242,10 +242,10 @@ static __inline void ahd_setup_noxfer_s static __inline void * ahd_sg_setup(struct ahd_softc *ahd, struct scb *scb, - void *sgptr, bus_addr_t addr, bus_size_t len, int last) + void *sgptr, dma_addr_t addr, bus_size_t len, int last) { scb->sg_count++; - if (sizeof(bus_addr_t) > 4 + if (sizeof(dma_addr_t) > 4 && (ahd->flags & AHD_64BIT_ADDRESSING) != 0) { struct ahd_dma64_seg *sg; @@ -361,7 +361,7 @@ ahd_sg_size(struct ahd_softc *ahd) static __inline void * ahd_sg_bus_to_virt(struct ahd_softc *ahd, struct scb *scb, uint32_t sg_busaddr) { - bus_addr_t sg_offset; + dma_addr_t sg_offset; /* sg_list_phys points to entry 1, not 0 */ sg_offset = sg_busaddr - (scb->sg_list_busaddr - ahd_sg_size(ahd)); @@ -371,7 +371,7 @@ ahd_sg_bus_to_virt(struct ahd_softc *ahd static __inline uint32_t ahd_sg_virt_to_bus(struct ahd_softc *ahd, struct scb *scb, void *sg) { - bus_addr_t sg_offset; + dma_addr_t sg_offset; /* sg_list_phys points to entry 1, not 0 */ sg_offset = ((uint8_t *)sg - (uint8_t *)scb->sg_list) _