Commit c835e3727b87115f98c612a5ecb8882826d2537e
Committed by
James Bottomley
1 parent
b6d44fe958
Exists in
master
and in
7 other branches
[SCSI] aacraid: draw line in sand, sundry cleanup and version update
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. Signed-off-by: Mark Salyzyn <aacraid@adaptec.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Showing 5 changed files with 7 additions and 10 deletions Side-by-side Diff
drivers/scsi/aacraid/aachba.c
... | ... | @@ -194,8 +194,7 @@ |
194 | 194 | struct scsi_device *device; |
195 | 195 | |
196 | 196 | if (unlikely(!scsicmd || !scsicmd->scsi_done )) { |
197 | - dprintk((KERN_WARNING "aac_valid_context: scsi command corrupt\n")) | |
198 | -; | |
197 | + dprintk((KERN_WARNING "aac_valid_context: scsi command corrupt\n")); | |
199 | 198 | aac_fib_complete(fibptr); |
200 | 199 | aac_fib_free(fibptr); |
201 | 200 | return 0; |
drivers/scsi/aacraid/aacraid.h
... | ... | @@ -12,7 +12,7 @@ |
12 | 12 | *----------------------------------------------------------------------------*/ |
13 | 13 | |
14 | 14 | #ifndef AAC_DRIVER_BUILD |
15 | -# define AAC_DRIVER_BUILD 2447 | |
15 | +# define AAC_DRIVER_BUILD 2449 | |
16 | 16 | # define AAC_DRIVER_BRANCH "-ms" |
17 | 17 | #endif |
18 | 18 | #define MAXIMUM_NUM_CONTAINERS 32 |
19 | 19 | |
... | ... | @@ -1807,10 +1807,10 @@ |
1807 | 1807 | * accounting for the fact capacity could be a 64 bit value |
1808 | 1808 | * |
1809 | 1809 | */ |
1810 | -static inline u32 cap_to_cyls(sector_t capacity, u32 divisor) | |
1810 | +static inline unsigned int cap_to_cyls(sector_t capacity, unsigned divisor) | |
1811 | 1811 | { |
1812 | 1812 | sector_div(capacity, divisor); |
1813 | - return (u32)capacity; | |
1813 | + return capacity; | |
1814 | 1814 | } |
1815 | 1815 | |
1816 | 1816 | /* SCp.phase values */ |
drivers/scsi/aacraid/linit.c
... | ... | @@ -1126,9 +1126,8 @@ |
1126 | 1126 | static void aac_shutdown(struct pci_dev *dev) |
1127 | 1127 | { |
1128 | 1128 | struct Scsi_Host *shost = pci_get_drvdata(dev); |
1129 | - struct aac_dev *aac = (struct aac_dev *)shost->hostdata; | |
1130 | 1129 | scsi_block_requests(shost); |
1131 | - __aac_shutdown(aac); | |
1130 | + __aac_shutdown((struct aac_dev *)shost->hostdata); | |
1132 | 1131 | } |
1133 | 1132 | |
1134 | 1133 | static void __devexit aac_remove_one(struct pci_dev *pdev) |
drivers/scsi/aacraid/nark.c
1 | 1 | /* |
2 | 2 | * Adaptec AAC series RAID controller driver |
3 | - * (c) Copyright 2001 Red Hat Inc. <alan@redhat.com> | |
4 | 3 | * |
5 | 4 | * based on the old aacraid driver that is.. |
6 | 5 | * Adaptec aacraid device driver for Linux. |
7 | 6 | * |
8 | - * Copyright (c) 2000 Adaptec, Inc. (aacraid@adaptec.com) | |
7 | + * Copyright (c) 2006-2007 Adaptec, Inc. (aacraid@adaptec.com) | |
9 | 8 | * |
10 | 9 | * This program is free software; you can redistribute it and/or modify |
11 | 10 | * it under the terms of the GNU General Public License as published by |
drivers/scsi/aacraid/rkt.c
... | ... | @@ -5,7 +5,7 @@ |
5 | 5 | * based on the old aacraid driver that is.. |
6 | 6 | * Adaptec aacraid device driver for Linux. |
7 | 7 | * |
8 | - * Copyright (c) 2000 Adaptec, Inc. (aacraid@adaptec.com) | |
8 | + * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.com) | |
9 | 9 | * |
10 | 10 | * This program is free software; you can redistribute it and/or modify |
11 | 11 | * it under the terms of the GNU General Public License as published by |