From d3c20327fb55e57c9f6c172ac0d770fe35911b55 Mon Sep 17 00:00:00 2001 From: David Jeffery <david_jeffery@adaptec.com> Date: Wed, 9 Oct 2002 01:03:13 -0700 Subject: [PATCH] [PATCH] ips driver 3/6 This patch adds an Adaptec copyright, makes a few minor comment changes, and removes a few unneeded macros. --- drivers/scsi/ips.c | 20 ++++++++++---------- drivers/scsi/ips.h | 19 +++++-------------- 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 6264da9a463c..219de52ae7f9 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c @@ -1,11 +1,12 @@ /*****************************************************************************/ -/* ips.c -- driver for the IBM ServeRAID controller */ +/* ips.c -- driver for the Adaptec / IBM ServeRAID controller */ /* */ /* Written By: Keith Mitchell, IBM Corporation */ /* Jack Hammer, Adaptec, Inc. */ /* David Jeffery, Adaptec, Inc. */ /* */ -/* Copyright (C) 2000 IBM Corporation */ +/* Copyright (C) 2000 IBM Corporation */ +/* Copyright (C) 2002 Adaptec, Inc. */ /* */ /* This program is free software; you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -42,7 +43,7 @@ /* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* */ /* Bugs/Comments/Suggestions about this driver should be mailed to: */ -/* ipslinux@us.ibm.com */ +/* ipslinux@adaptec.com */ /* */ /* For system support issues, contact your local IBM Customer support. */ /* Directions to find IBM Customer Support for each country can be found at: */ @@ -66,9 +67,8 @@ /* 0.99.05 - Fix an oops when we get certain passthru commands */ /* 1.00.00 - Initial Public Release */ /* Functionally equivalent to 0.99.05 */ -/* 3.60.00 - Bump max commands to 128 for use with ServeRAID firmware 3.60 */ -/* - Change version to 3.60 to coincide with ServeRAID release */ -/* numbering. */ +/* 3.60.00 - Bump max commands to 128 for use with firmware 3.60 */ +/* - Change version to 3.60 to coincide with release numbering. */ /* 3.60.01 - Remove bogus error check in passthru routine */ /* 3.60.02 - Make DCDB direction based on lookup table */ /* - Only allow one DCDB command to a SCSI ID at a time */ @@ -76,7 +76,7 @@ /* 4.00.01 - Add support for First Failure Data Capture */ /* 4.00.02 - Fix problem with PT DCDB with no buffer */ /* 4.00.03 - Add alternative passthru interface */ -/* - Add ability to flash ServeRAID BIOS */ +/* - Add ability to flash BIOS */ /* 4.00.04 - Rename structures/constants to be prefixed with IPS_ */ /* 4.00.05 - Remove wish_block from init routine */ /* - Use linux/spinlock.h instead of asm/spinlock.h for kernels */ @@ -220,7 +220,7 @@ struct proc_dir_entry proc_scsi_ips = { dma_addr_t *dmahandle) { void * ptr = kmalloc(size, GFP_ATOMIC); if(ptr){ - *dmahandle = VIRT_TO_BUS(ptr); + *dmahandle = (uint32_t)virt_to_bus(ptr); } return ptr; } @@ -229,10 +229,10 @@ struct proc_dir_entry proc_scsi_ips = { #define pci_map_sg(a,b,n,z) (n) #define pci_unmap_sg(a,b,c,d) - #define pci_map_single(a,b,c,d) (VIRT_TO_BUS(b)) + #define pci_map_single(a,b,c,d) ((uint32_t)virt_to_bus(b)) #define pci_unmap_single(a,b,c,d) #ifndef sg_dma_address - #define sg_dma_address(x) (VIRT_TO_BUS((x)->address)) + #define sg_dma_address(x) ((uint32_t)virt_to_bus((x)->address)) #define sg_dma_len(x) ((x)->length) #endif #define pci_unregister_driver(x) diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h index 9cc112d362e6..9fb98aa190ac 100644 --- a/drivers/scsi/ips.h +++ b/drivers/scsi/ips.h @@ -1,9 +1,12 @@ /*****************************************************************************/ -/* ips.h -- driver for the IBM ServeRAID controller */ +/* ips.h -- driver for the Adaptec / IBM ServeRAID controller */ /* */ /* Written By: Keith Mitchell, IBM Corporation */ +/* Jack Hammer, Adaptec, Inc. */ +/* David Jeffery, Adaptec, Inc. */ /* */ /* Copyright (C) 1999 IBM Corporation */ +/* Copyright (C) 2003 Adaptec, Inc. */ /* */ /* This program is free software; you can redistribute it and/or modify */ /* it under the terms of the GNU General Public License as published by */ @@ -40,7 +43,7 @@ /* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* */ /* Bugs/Comments/Suggestions should be mailed to: */ -/* ipslinux@us.ibm.com */ +/* ipslinux@adaptec.com */ /* */ /*****************************************************************************/ @@ -84,21 +87,9 @@ ((IPS_IS_TROMBONE(ha) || IPS_IS_CLARINET(ha)) && \ (ips_force_memio))) ? 1 : 0) - #ifndef VIRT_TO_BUS - #define VIRT_TO_BUS(x) (uint32_t) virt_to_bus((void *) x) - #endif - #ifndef MDELAY #define MDELAY mdelay #endif - - #ifndef verify_area_20 - #define verify_area_20(t,a,sz) (0) /* success */ - #endif - - #ifndef DECLARE_MUTEX_LOCKED - #define DECLARE_MUTEX_LOCKED(sem) struct semaphore sem = MUTEX_LOCKED; - #endif /* * Lock macros -- 2.30.9