[PATCH 1/1] aacraid: draw line in sand, sundry cleanup and version update

Salyzyn, Mark
2007-07-26T18:20:09Z

[-- Attachment #1: Type: text/plain, Size: 741 bytes --]

Minor unimportant cuttings from the floor bundled in with a version
stamp update. Only controversial change is the dropping of Alan Cox
copyright on the nark.c module since that file has no code written by
him in it.

This attached patch is against current scsi-misc-2.6

ObligatoryDisclaimer: Please accept my condolences regarding Outlook's
handling of patch attachments.

Signed-off-by: Mark Salyzyn <aacraid@adaptec.com>

drivers/scsi/aacraid/aachba.c | 3 +--
drivers/scsi/aacraid/aacraid.h | 6 +++---
drivers/scsi/aacraid/linit.c | 3 +--
drivers/scsi/aacraid/nark.c | 3 +--
drivers/scsi/aacraid/rkt.c | 2 +-
5 files changed, 7 insertions(+), 10 deletions(-)

Sincerely -- Mark Salyzyn

[-- Attachment #2: aacraid_cleanup_2449.patch --]
[-- Type: application/octet-stream, Size: 3267 bytes --]

diff -ru a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
--- a/drivers/scsi/aacraid/aachba.c 2007-07-26 13:28:32.179279220 -0400
+++ b/drivers/scsi/aacraid/aachba.c 2007-07-26 14:11:31.762916390 -0400
@@ -194,8 +194,7 @@
struct scsi_device *device;

if (unlikely(!scsicmd || !scsicmd->scsi_done )) {
- dprintk((KERN_WARNING "aac_valid_context: scsi command corrupt\n"))
-;
+ dprintk((KERN_WARNING "aac_valid_context: scsi command corrupt\n"));
aac_fib_complete(fibptr);
aac_fib_free(fibptr);
return 0;
diff -ru a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
--- a/drivers/scsi/aacraid/aacraid.h 2007-07-26 13:28:32.180279094 -0400
+++ b/drivers/scsi/aacraid/aacraid.h 2007-07-26 14:11:31.770915383 -0400
@@ -12,7 +12,7 @@
*----------------------------------------------------------------------------*/

#ifndef AAC_DRIVER_BUILD
-# define AAC_DRIVER_BUILD 2447
+# define AAC_DRIVER_BUILD 2449
# define AAC_DRIVER_BRANCH "-ms"
#endif
#define MAXIMUM_NUM_CONTAINERS 32
@@ -1807,10 +1807,10 @@
* accounting for the fact capacity could be a 64 bit value
*
*/
-static inline u32 cap_to_cyls(sector_t capacity, u32 divisor)
+static inline unsigned int cap_to_cyls(sector_t capacity, unsigned divisor)
{
sector_div(capacity, divisor);
- return (u32)capacity;
+ return capacity;
}

/* SCp.phase values */
diff -ru a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
--- a/drivers/scsi/aacraid/linit.c 2007-07-26 13:28:32.183278715 -0400
+++ b/drivers/scsi/aacraid/linit.c 2007-07-26 14:11:31.772915132 -0400
@@ -1122,9 +1122,8 @@
static void aac_shutdown(struct pci_dev *dev)
{
struct Scsi_Host *shost = pci_get_drvdata(dev);
- struct aac_dev *aac = (struct aac_dev *)shost->hostdata;
scsi_block_requests(shost);
- __aac_shutdown(aac);
+ __aac_shutdown((struct aac_dev *)shost->hostdata);
}

static void __devexit aac_remove_one(struct pci_dev *pdev)
diff -ru a/drivers/scsi/aacraid/nark.c b/drivers/scsi/aacraid/nark.c
--- a/drivers/scsi/aacraid/nark.c 2007-07-26 13:28:32.184278589 -0400
+++ b/drivers/scsi/aacraid/nark.c 2007-07-26 14:11:31.772915132 -0400
@@ -1,11 +1,10 @@
/*
* Adaptec AAC series RAID controller driver
- * (c) Copyright 2001 Red Hat Inc. <alan@redhat.com>
*
* based on the old aacraid driver that is..
* Adaptec aacraid device driver for Linux.
*
- * Copyright (c) 2000 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2006-2007 Adaptec, Inc. (aacraid@adaptec.com)
*
* 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
diff -ru a/drivers/scsi/aacraid/rkt.c b/drivers/scsi/aacraid/rkt.c
--- a/drivers/scsi/aacraid/rkt.c 2007-07-26 13:28:32.184278589 -0400
+++ b/drivers/scsi/aacraid/rkt.c 2007-07-26 14:11:31.780914125 -0400
@@ -5,7 +5,7 @@
* based on the old aacraid driver that is..
* Adaptec aacraid device driver for Linux.
*
- * Copyright (c) 2000 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.com)
*
* 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