Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c835e372 authored by Salyzyn, Mark's avatar Salyzyn, Mark Committed by James Bottomley
Browse files

[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: default avatarMark Salyzyn <aacraid@adaptec.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent b6d44fe9

drivers/scsi/aacraid/aachba.c

+1 −2
Original line number Diff line number Diff line
@@ -194,8 +194,7 @@ static inline int aac_valid_context(struct scsi_cmnd *scsicmd, 
	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;

drivers/scsi/aacraid/aacraid.h

+3 −3
Original line number Diff line number Diff line
@@ -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 @@ struct aac_aifcmd { 
 *  	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 */

drivers/scsi/aacraid/linit.c

+1 −2
Original line number Diff line number Diff line
@@ -1126,9 +1126,8 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, 
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)

drivers/scsi/aacraid/nark.c

+1 −2
Original line number Diff line number Diff line 
/*

 *	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

drivers/scsi/aacraid/rkt.c

+1 −1
Original line number Diff line number Diff line
@@ -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