Commit f2ef0ce7 authored by Robert Elliott's avatar Robert Elliott Committed by James Bottomley
Browse files

hpsa: adjust RAID-1, RAID-1ADM, and RAID-6 names 



HP now uses RAID-6 rather than RAID-ADG (Advanced Data Guarding)
as the marketing name for our implementation of RAID-6.

The driver considers RAID-1 and RAID-1+0 to be the same level, and
considers RAID-1ADM and RAID-1+0ADM to be the same level.  Parenthesis
can be used to reflect the optional +0 portion of both those RAID levels.

Rename: RAID-ADG to RAID-6
	RAID-1(1+0) to RAID-1(+0)
	RAID-1(ADM) to RAID-1(+0)ADM

Also, add another const after the pointer type as suggested
by checkpatch.pl so the array is:
	static const char * const raid_label[]

Reviewed-by: default avatarScott Teel <scott.teel@pmcs.com>
Signed-off-by: default avatarRobert Elliott <elliott@hp.com>
Signed-off-by: default avatarDon Brace <don.brace@pmcs.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 7c0a0229

drivers/scsi/hpsa.c

+2 −2
Original line number Diff line number Diff line
@@ -507,8 +507,8 @@ static inline int is_logical_dev_addr_mode(unsigned char scsi3addr[]) 
	return (scsi3addr[3] & 0xC0) == 0x40;

}



static const char *raid_label[] = { "0", "4", "1(1+0)", "5", "5+1", "ADG",

	"1(ADM)", "UNKNOWN"

static const char * const raid_label[] = { "0", "4", "1(+0)", "5", "5+1", "6",

	"1(+0)ADM", "UNKNOWN"

};

#define HPSA_RAID_0	0

#define HPSA_RAID_4	1

CRA Git | Maintained and supported by SUSTech CRA and CCSE