mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
[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>
This commit is contained in:
parent
b6d44fe958
commit
c835e3727b
5 changed files with 7 additions and 10 deletions
|
@ -194,8 +194,7 @@ static inline int aac_valid_context(struct scsi_cmnd *scsicmd,
|
||||||
struct scsi_device *device;
|
struct scsi_device *device;
|
||||||
|
|
||||||
if (unlikely(!scsicmd || !scsicmd->scsi_done )) {
|
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_complete(fibptr);
|
||||||
aac_fib_free(fibptr);
|
aac_fib_free(fibptr);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
*----------------------------------------------------------------------------*/
|
*----------------------------------------------------------------------------*/
|
||||||
|
|
||||||
#ifndef AAC_DRIVER_BUILD
|
#ifndef AAC_DRIVER_BUILD
|
||||||
# define AAC_DRIVER_BUILD 2447
|
# define AAC_DRIVER_BUILD 2449
|
||||||
# define AAC_DRIVER_BRANCH "-ms"
|
# define AAC_DRIVER_BRANCH "-ms"
|
||||||
#endif
|
#endif
|
||||||
#define MAXIMUM_NUM_CONTAINERS 32
|
#define MAXIMUM_NUM_CONTAINERS 32
|
||||||
|
@ -1807,10 +1807,10 @@ struct aac_aifcmd {
|
||||||
* accounting for the fact capacity could be a 64 bit value
|
* 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);
|
sector_div(capacity, divisor);
|
||||||
return (u32)capacity;
|
return capacity;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* SCp.phase values */
|
/* SCp.phase values */
|
||||||
|
|
|
@ -1126,9 +1126,8 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
|
||||||
static void aac_shutdown(struct pci_dev *dev)
|
static void aac_shutdown(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
struct Scsi_Host *shost = pci_get_drvdata(dev);
|
struct Scsi_Host *shost = pci_get_drvdata(dev);
|
||||||
struct aac_dev *aac = (struct aac_dev *)shost->hostdata;
|
|
||||||
scsi_block_requests(shost);
|
scsi_block_requests(shost);
|
||||||
__aac_shutdown(aac);
|
__aac_shutdown((struct aac_dev *)shost->hostdata);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __devexit aac_remove_one(struct pci_dev *pdev)
|
static void __devexit aac_remove_one(struct pci_dev *pdev)
|
||||||
|
|
|
@ -1,11 +1,10 @@
|
||||||
/*
|
/*
|
||||||
* Adaptec AAC series RAID controller driver
|
* Adaptec AAC series RAID controller driver
|
||||||
* (c) Copyright 2001 Red Hat Inc. <alan@redhat.com>
|
|
||||||
*
|
*
|
||||||
* based on the old aacraid driver that is..
|
* based on the old aacraid driver that is..
|
||||||
* Adaptec aacraid device driver for Linux.
|
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
* based on the old aacraid driver that is..
|
* based on the old aacraid driver that is..
|
||||||
* Adaptec aacraid device driver for Linux.
|
* 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
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
|
Loading…
Reference in a new issue