[patch-kj] remove old ifdef'd code from

[patch-kj] remove old ifdef'd code from

[maximilian attems]

 From: Domen Puncer <domen@coderock.org>
 Patches to remove some old ifdefs.
 kill compat cruft like #define ahd_pci_set_dma_mask pci_set_dma_mask

Signed-off-by: Maximilian Attems <janitor@sternwelten.at>



---

 linux-2.6.7-max/drivers/scsi/aic7xxx/aic79xx_core.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff -puN drivers/scsi/aic7xxx/aic79xx_core.c~remove-old-ifdefs-aic79xx_core drivers/scsi/aic7xxx/aic79xx_core.c
--- linux-2.6.7/drivers/scsi/aic7xxx/aic79xx_core.c~remove-old-ifdefs-aic79xx_core	2004-06-18 09:13:42.000000000 +0200
+++ linux-2.6.7-max/drivers/scsi/aic7xxx/aic79xx_core.c	2004-06-18 09:13:42.000000000 +0200
@@ -5493,9 +5493,9 @@ ahd_probe_scbs(struct ahd_softc *ahd) {
 static void
 ahd_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;
 }
 
@@ -5926,9 +5926,9 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
 	struct map_node *sense_map;
 	uint8_t		*segs;
 	uint8_t		*sense_data;
-	bus_addr_t	 hscb_busaddr;
-	bus_addr_t	 sg_busaddr;
-	bus_addr_t	 sense_busaddr;
+	dma_addr_t	 hscb_busaddr;
+	dma_addr_t	 sg_busaddr;
+	dma_addr_t	 sense_busaddr;
 	int		 newcount;
 	int		 i;
 
@@ -6161,7 +6161,7 @@ ahd_init(struct ahd_softc *ahd)
 {
 	uint8_t		*base_vaddr;
 	uint8_t		*next_vaddr;
-	bus_addr_t	 next_baddr;
+	dma_addr_t	 next_baddr;
 	size_t		 driver_data_size;
 	int		 i;
 	int		 error;
@@ -6205,7 +6205,7 @@ ahd_init(struct ahd_softc *ahd)
 	if (ahd_dma_tag_create(ahd, ahd->parent_dmat, /*alignment*/1,
 			       /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
 			       /*lowaddr*/ahd->flags & AHD_39BIT_ADDRESSING
-					? (bus_addr_t)0x7FFFFFFFFFULL
+					? (dma_addr_t)0x7FFFFFFFFFULL
 					: BUS_SPACE_MAXADDR_32BIT,
 			       /*highaddr*/BUS_SPACE_MAXADDR,
 			       /*filter*/NULL, /*filterarg*/NULL,

_

[patch-kj] remove old ifdef'd code from

[maximilian attems]

 From: Domen Puncer <domen@coderock.org>
 Patches to remove some old ifdefs.
 Signed-off-by: Maximilian Attems <janitor@sternwelten.at>


---

 linux-2.6.7-max/drivers/scsi/dc390.h |    7 +------
 1 files changed, 1 insertion(+), 6 deletions(-)

diff -puN drivers/scsi/dc390.h~remove-old-ifdefs-dc390 drivers/scsi/dc390.h
--- linux-2.6.7/drivers/scsi/dc390.h~remove-old-ifdefs-dc390	2004-06-18 09:14:56.000000000 +0200
+++ linux-2.6.7-max/drivers/scsi/dc390.h	2004-06-18 09:14:56.000000000 +0200
@@ -13,11 +13,6 @@
 #ifndef DC390_H
 #define DC390_H
 
-#include <linux/version.h>
-#ifndef KERNEL_VERSION
-# define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-#endif
-
 #define DC390_BANNER "Tekram DC390/AM53C974"
 #define DC390_VERSION "2.1b 2004-04-13"
 
@@ -26,7 +21,7 @@
  * So long: Use old exception handling :-( */
 #define OLD_EH
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION (2,1,70) || defined (OLD_EH)
+#ifdef OLD_EH
 # define NEW_EH
 #else
 # define NEW_EH use_new_eh_code: 1,

_

Re: [patch-kj] remove old ifdef'd code from

[Christoph Hellwig]

On Mon, Jun 21, 2004 at 08:29:18PM +0200, maximilian attems wrote:
> 
>  From: Domen Puncer <domen@coderock.org>
>  Patches to remove some old ifdefs.
>  Signed-off-by: Maximilian Attems <janitor@sternwelten.at>

While the changes are okay, this driver is beeing changed rapidly and I
have a patch pending that's a supertset of yours.  So please don't apply
James.

Re: [patch-kj] remove old ifdef'd code from

[maximilian attems]

hello Christoph,

thanks for the feedback.

On Mon, 21 Jun 2004, Christoph Hellwig wrote:

> On Mon, Jun 21, 2004 at 08:29:18PM +0200, maximilian attems wrote:
> > 
> >  From: Domen Puncer <domen@coderock.org>
> >  Patches to remove some old ifdefs.
> >  Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
> 
> While the changes are okay, this driver is beeing changed rapidly and I
> have a patch pending that's a supertset of yours.  So please don't apply
> James.

are you referring to the dc390 driver patches?
what about the aic7xxx and the aic79xx?
please precise so that i can drop from next kj patch set
the ones you are working on.

a++ max

Re: [patch-kj] remove old ifdef'd code from

[Christoph Hellwig]

On Tue, Jun 22, 2004 at 10:44:40AM +0200, maximilian attems wrote:
> > While the changes are okay, this driver is beeing changed rapidly and I
> > have a patch pending that's a supertset of yours.  So please don't apply
> > James.
> 
> are you referring to the dc390 driver patches?

Yes.

> what about the aic7xxx and the aic79xx?

There have been rumors on linux-scsi that adaptec is starting to maintain
them again. OTOH they'll need to redo their patches in small steps anyway
so your patches look fine to me.

Re: [patch-kj] remove old ifdef'd code from

[maximilian attems]

On Tue, 22 Jun 2004, Christoph Hellwig wrote:

> On Tue, Jun 22, 2004 at 10:44:40AM +0200, maximilian attems wrote:
> > > While the changes are okay, this driver is beeing changed rapidly and I
> > > have a patch pending that's a supertset of yours.  So please don't apply
> > > James.
> > 
> > are you referring to the dc390 driver patches?
> 
> Yes.

ok i'll drop that.
 
> > what about the aic7xxx and the aic79xx?
> 
> There have been rumors on linux-scsi that adaptec is starting to maintain
> them again. OTOH they'll need to redo their patches in small steps anyway
> so your patches look fine to me.

thanks for the review,
so  i'll sent them to andrew.

a++ maks