cciss: remove C99-style comments
Subsystems (3)
PATCH 1/2 cciss: remove C99-style comments
Some cleanup before the header file split-out so we don't propagate this style into new files.
--- drivers/block/cciss.c | 37 +++++++++++++------------ drivers/block/cciss.h | 9 +++--- drivers/block/cciss_cmd.h | 61 ++++++++++++++++++++---------------------- drivers/block/cciss_scsi.h | 18 ++++++------ include/linux/cciss_ioctl.h | 33 ++++++++++++----------- 5 files changed, 78 insertions(+), 80 deletions(-)
drivers/block/cciss.c +19 -18
@@ -1344,26 +1344,27 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,kfree (buff);return -ENOMEM ; } -// Fill in the command type +/* Fill in the command type */ c->cmd_type =CMD_IOCTL_PEND ; -// Fill in Command Header - c->Header.ReplyQueue =0 ;// unused in simple mode -if (iocommand.buf_size >0 )// buffer to fill +/* Fill in Command Header */ + c->Header.ReplyQueue =0 ;/* unused in simple mode */ +if (iocommand.buf_size >0 )/* buffer to fill */ { c->Header.SGList =1 ; c->Header.SGTotal =1 ; - }else // no buffers to fill + }else /* no buffers to fill */ { c->Header.SGList =0 ; c->Header.SGTotal =0 ; } c->Header.LUN = iocommand.LUN_info; - c->Header.Tag.lower = c->busaddr;// use the kernel address the cmd block for tag +/* use the kernel address the cmd block for tag */ + c->Header.Tag.lower = c->busaddr; -// Fill in Request block +/* Fill in Request block */ c->Request = iocommand.Request; -// Fill in the scatter gather information +/* Fill in the scatter gather information */ if (iocommand.buf_size >0 ) { temp64.val = pci_map_single(host->pdev, buff, iocommand.buf_size,
@@ -1371,7 +1372,7 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode, c->SG[0 ].Addr.lower = temp64.val32.lower; c->SG[0 ].Addr.upper = temp64.val32.upper; c->SG[0 ].Len = iocommand.buf_size; - c->SG[0 ].Ext =0 ;// we are not chaining + c->SG[0 ].Ext =0 ;/* we are not chaining */ } c->waiting = &wait;
@@ -2425,7 +2426,7 @@ static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff, c->Request.Type.Direction =XFER_READ ; c->Request.Timeout =0 ; c->Request.CDB[0 ] = cmd; - c->Request.CDB[6 ] = (size >>24 ) &0xFF ;//MSB + c->Request.CDB[6 ] = (size >>24 ) &0xFF ;/* MSB */ c->Request.CDB[7 ] = (size >>16 ) &0xFF ; c->Request.CDB[8 ] = (size >>8 ) &0xFF ; c->Request.CDB[9 ] = size &0xFF ;
@@ -2694,7 +2695,7 @@ static void cciss_geometry_inquiry(int ctlr, int logvol,"cciss: reading geometry failed, volume " "does not support reading geometry\n"); drv->heads =255 ; - drv->sectors =32 ;// Sectors per track + drv->sectors =32 ;/* Sectors per track */ drv->cylinders = total_size +1 ; drv->raid_level =RAID_UNKNOWN ; }else {
@@ -3112,19 +3113,19 @@ static void do_cciss_request(struct request_queue *q)/* fill in the request */ drv = creq->rq_disk->private_data; - c->Header.ReplyQueue =0 ;// unused in simple mode + c->Header.ReplyQueue =0 ;/* unused in simple mode */ /* got command from pool, so use the command block index instead */ /* for direct lookups. */ /* The first 2 bits are reserved for controller error reporting. */ c->Header.Tag.lower = (c->cmdindex <<3 ); c->Header.Tag.lower |=0x04 ;/* flag for direct lookup. */ memcpy (&c->Header.LUN, drv->LunID,sizeof (drv->LunID)); - c->Request.CDBLen =10 ;// 12 byte commands not in FW yet; - c->Request.Type.Type =TYPE_CMD ;// It is a command. + c->Request.CDBLen =10 ;/* 12 byte commands not in FW yet; */ + c->Request.Type.Type =TYPE_CMD ;/* It is a command. */ c->Request.Type.Attribute =ATTR_SIMPLE ; c->Request.Type.Direction = (rq_data_dir (creq) ==READ ) ?XFER_READ :XFER_WRITE ; - c->Request.Timeout =0 ;// Don't time out + c->Request.Timeout =0 ;/* Don't time out */ c->Request.CDB[0 ] = (rq_data_dir (creq) ==READ ) ? h->cciss_read : h->cciss_write; start_blk =blk_rq_pos (creq);
@@ -3209,11 +3210,11 @@ static void do_cciss_request(struct request_queue *q)if (likely (blk_fs_request (creq))) {if (h->cciss_read ==CCISS_READ_10 ) { c->Request.CDB[1 ] =0 ; - c->Request.CDB[2 ] = (start_blk >>24 ) &0xff ;//MSB + c->Request.CDB[2 ] = (start_blk >>24 ) &0xff ;/* MSB */ c->Request.CDB[3 ] = (start_blk >>16 ) &0xff ; c->Request.CDB[4 ] = (start_blk >>8 ) &0xff ; c->Request.CDB[5 ] = start_blk &0xff ; - c->Request.CDB[6 ] =0 ;// (sect >> 24) & 0xff; MSB + c->Request.CDB[6 ] =0 ;/* (sect >> 24) & 0xff; MSB */ c->Request.CDB[7 ] = (blk_rq_sectors (creq) >>8 ) &0xff ; c->Request.CDB[8 ] =blk_rq_sectors (creq) &0xff ; c->Request.CDB[9 ] = c->Request.CDB[11 ] = c->Request.CDB[12 ] =0 ;
@@ -3222,7 +3223,7 @@ static void do_cciss_request(struct request_queue *q) c->Request.CDBLen =16 ; c->Request.CDB[1 ]=0 ; - c->Request.CDB[2 ]= (upper32 >>24 ) &0xff ;//MSB + c->Request.CDB[2 ]= (upper32 >>24 ) &0xff ;/* MSB */ c->Request.CDB[3 ]= (upper32 >>16 ) &0xff ; c->Request.CDB[4 ]= (upper32 >>8 ) &0xff ; c->Request.CDB[5 ]= upper32 &0xff ;
drivers/block/cciss.h +4 -5
@@ -66,7 +66,7 @@ struct ctlr_infoint ctlr;char devname[8 ];char *product_name; -char firm_ver[4 ];// Firmware version +char firm_ver[4 ];/* Firmware version */ struct pci_dev *pdev;__u32 board_id;void __iomem *vaddr;
@@ -103,7 +103,7 @@ struct ctlr_infoBYTE cciss_write;BYTE cciss_read_capacity; -// information about each logical volume +/* information about each logical volume */ drive_info_struct *drv[CISS_MAX_LUN ];struct access_method access;
@@ -116,7 +116,7 @@ struct ctlr_infounsigned int maxSG;spinlock_t lock; -//* pointers to command and error info pool */ +/* pointers to command and error info pool */ CommandList_struct *cmd_pool;dma_addr_t cmd_pool_dhandle;ErrorInfo_struct *errinfo_pool;
@@ -134,7 +134,7 @@ struct ctlr_info*/ int next_to_run; -// Disk structures we need to pass back +/* Disk structures we need to pass back */ struct gendisk *gendisk[CISS_MAX_LUN ];#ifdef CONFIG_CISS_SCSI_TAPE void *scsi_ctlr;/* ptr to structure containing scsi related stuff */
@@ -315,4 +315,3 @@ struct board_type {#define CCISS_LOCK (i) (&hba[i]->lock)#endif /* CCISS_H */ -
drivers/block/cciss_cmd.h +29 -32
177 lines not on this page · raw message
drivers/block/cciss_scsi.h +9 -9
@@ -25,16 +25,16 @@#include <scsi/scsicam.h> /* possibly irrelevant, since we don't show disks */ -// the scsi id of the adapter... +/* the scsi id of the adapter... */ #define SELF_SCSI_ID 15 -// 15 is somewhat arbitrary, since the scsi-2 bus -// that's presented by the driver to the OS is -// fabricated. The "real" scsi-3 bus the -// hardware presents is fabricated too. -// The actual, honest-to-goodness physical -// bus that the devices are attached to is not -// addressible natively, and may in fact turn -// out to be not scsi at all. +/* 15 is somewhat arbitrary, since the scsi-2 bus +that's presented by the driver to the OS is +fabricated. The "real" scsi-3 bus the +hardware presents is fabricated too. +The actual, honest-to-goodness physical +bus that the devices are attached to is not +addressible natively, and may in fact turn +out to be not scsi at all. */ #define SCSI_CCISS_CAN_QUEUE 2
include/linux/cciss_ioctl.h +17 -16
@@ -37,12 +37,13 @@ typedef __u32 DriverVer_type;#define MAX_KMALLOC_SIZE 128000#ifndef CCISS_CMD_H -// This defines are duplicated in cciss_cmd.h in the driver directory +/* This defines are duplicated in cciss_cmd.h in the driver directory */ -//general boundary definitions -#define SENSEINFOBYTES 32//note that this value may vary between host implementations +/* general boundary definitions */ +#define SENSEINFOBYTES 32/* note that this value may vary +between host implementations */ -//Command Status value +/* Command Status value */ #define CMD_SUCCESS 0x0000#define CMD_TARGET_STATUS 0x0001#define CMD_DATA_UNDERRUN 0x0002
@@ -57,24 +58,24 @@ typedef __u32 DriverVer_type;#define CMD_TIMEOUT 0x000B#define CMD_UNABORTABLE 0x000C -//transfer direction +/* transfer direction */ #define XFER_NONE 0x00#define XFER_WRITE 0x01#define XFER_READ 0x02#define XFER_RSVD 0x03 -//task attribute +/* task attribute */ #define ATTR_UNTAGGED 0x00#define ATTR_SIMPLE 0x04#define ATTR_HEADOFQUEUE 0x05#define ATTR_ORDERED 0x06#define ATTR_ACA 0x07 -//cdb type +/* cdb type */ #define TYPE_CMD 0x00#define TYPE_MSG 0x01 -// Type defs used in the following structs +/* Type defs used in the following structs */ #define BYTE __u8#define WORD __u16#define HWORD __u16
@@ -82,28 +83,28 @@ typedef __u32 DriverVer_type;#define CISS_MAX_LUN 1024 -#define LEVEL2LUN 1 // index into Target(x) structure, due to byte swapping +#define LEVEL2LUN 1/* index into Target(x) structure, due to byte swapping */ #define LEVEL3LUN 0#pragma pack(1) -//Command List Structure +/* Command List Structure */ typedef union _SCSI3Addr_struct {struct {BYTE Dev;BYTE Bus:6 ; -BYTE Mode:2 ;// b00 +BYTE Mode:2 ;/* b00 */ } PeripDev;struct {BYTE DevLSB;BYTE DevMSB:6 ; -BYTE Mode:2 ;// b01 +BYTE Mode:2 ;/* b01 */ } LogDev;struct {BYTE Dev:5 ;BYTE Bus:3 ;BYTE Targ:6 ; -BYTE Mode:2 ;// b10 +BYTE Mode:2 ;/* b10 */ } LogUnit; }SCSI3Addr_struct ;
@@ -111,7 +112,7 @@ typedef struct _PhysDevAddr_struct { DWORD TargetId:24; DWORD Bus:6; DWORD Mode:2; -SCSI3Addr_struct Target[2 ];//2 level target device addr +SCSI3Addr_struct Target[2 ];/* 2 level target device addr */ } PhysDevAddr_struct; typedef struct _LogDevAddr_struct {
@@ -146,8 +147,8 @@ typedef union _MoreErrInfo_struct{ }Common_Info;struct {BYTE Reserved[2 ]; -BYTE offense_size;//size of offending entry -BYTE offense_num;//byte # of offense 0-base +BYTE offense_size;/* size of offending entry */ +BYTE offense_num;/* byte # of offense 0-base */ DWORD offense_value; }Invalid_Cmd; }MoreErrInfo_struct;
Signature · 1 line
1.6.6.1
PATCH 2/2 cciss: Consolidate duplicate bits in cciss_cmd.h & cciss_ioctl.h
There are several duplicate definitions in cciss_cmd.h and cciss_ioctl.h. Consolidate these into the new cciss_defs.h file. This patch doesn't change the definitions exposed under include/linux, so userspace apps shouldn't be affected.
--- drivers/block/cciss_cmd.h | 113 +------------------------------------ include/linux/cciss_defs.h | 130 +++++++++++++++++++++++++++++++++++++++++++ include/linux/cciss_ioctl.h | 129 +------------------------------------------ 3 files changed, 134 insertions(+), 238 deletions(-) create mode 100644 include/linux/cciss_defs.h
drivers/block/cciss_cmd.h +3 -110
@@ -1,30 +1,16 @@#ifndef CCISS_CMD_H #define CCISS_CMD_H + +#include <linux/cciss_defs.h> +/* DEFINES */ #define CISS_VERSION "1.00"/* general boundary definitions */ -#define SENSEINFOBYTES 32/* note that this value may vary -between host implementations */ #define MAXSGENTRIES 32#define CCISS_SG_CHAIN 0x80000000#define MAXREPLYQS 256 -/* Command Status value */ -#define CMD_SUCCESS 0x0000 -#define CMD_TARGET_STATUS 0x0001 -#define CMD_DATA_UNDERRUN 0x0002 -#define CMD_DATA_OVERRUN 0x0003 -#define CMD_INVALID 0x0004 -#define CMD_PROTOCOL_ERR 0x0005 -#define CMD_HARDWARE_ERR 0x0006 -#define CMD_CONNECTION_LOST 0x0007 -#define CMD_ABORTED 0x0008 -#define CMD_ABORT_FAILED 0x0009 -#define CMD_UNSOLICITED_ABORT 0x000A -#define CMD_TIMEOUT 0x000B -#define CMD_UNABORTABLE 0x000C -/* Unit Attentions ASC's as defined for the MSA2012sa */ #define POWER_OR_RESET 0x29#define STATE_CHANGED 0x2a
@@ -48,23 +34,6 @@#define ASYM_ACCESS_CHANGED 0x06#define LUN_CAPACITY_CHANGED 0x09 -/* transfer direction */ -#define XFER_NONE 0x00 -#define XFER_WRITE 0x01 -#define XFER_READ 0x02 -#define XFER_RSVD 0x03 - -/* task attribute */ -#define ATTR_UNTAGGED 0x00 -#define ATTR_SIMPLE 0x04 -#define ATTR_HEADOFQUEUE 0x05 -#define ATTR_ORDERED 0x06 -#define ATTR_ACA 0x07 - -/* cdb type */ -#define TYPE_CMD 0x00 -#define TYPE_MSG 0x01 -/* config space register offsets */ #define CFG_VENDORID 0x00#define CFG_DEVICEID 0x02
@@ -103,14 +72,9 @@ typedef union _u64bit } u64bit;/* Type defs used in the following structs */ -#define BYTE __u8 -#define WORD __u16 -#define HWORD __u16 -#define DWORD __u32#define QWORD vals32/* STRUCTURES */ -#define CISS_MAX_LUN 1024#define CISS_MAX_PHYS_LUN 1024/* SCSI-3 Cmmands */
@@ -176,45 +140,6 @@ typedef struct _ReadCapdata_struct_16#define CCISS_CACHE_FLUSH 0x01/* C2 was already being used by CCISS */ /* Command List Structure */ -typedef union _SCSI3Addr_struct { -struct { -BYTE Dev; -BYTE Bus:6 ; -BYTE Mode:2 ;/* b00 */ - } PeripDev; -struct { -BYTE DevLSB; -BYTE DevMSB:6 ; -BYTE Mode:2 ;/* b01 */ - } LogDev; -struct { -BYTE Dev:5 ; -BYTE Bus:3 ; -BYTE Targ:6 ; -BYTE Mode:2 ;/* b10 */ - } LogUnit; -}SCSI3Addr_struct ; - -typedef struct _PhysDevAddr_struct { -DWORD TargetId:24 ; -DWORD Bus:6 ; -DWORD Mode:2 ; -SCSI3Addr_struct Target[2 ];/* 2 level target device addr */ -}PhysDevAddr_struct ; - -typedef struct _LogDevAddr_struct { -DWORD VolId:30 ; -DWORD Mode:2 ; -BYTE reserved[4 ]; -}LogDevAddr_struct ; - -typedef union _LUNAddr_struct { -BYTE LunAddrBytes[8 ]; -SCSI3Addr_struct SCSI3Lun[4 ]; -PhysDevAddr_struct PhysDev; -LogDevAddr_struct LogDev; -}LUNAddr_struct ; -#define CTLR_LUNID "\0\0\0\0\0\0\0\0" typedef struct _CommandListHeader_struct {
@@ -224,16 +149,6 @@ typedef struct _CommandListHeader_struct {QWORD Tag;LUNAddr_struct LUN ; } CommandListHeader_struct; -typedef struct _RequestBlock_struct { -BYTE CDBLen; -struct { -BYTE Type:3 ; -BYTE Attribute:3 ; -BYTE Direction:2 ; - } Type; -HWORD Timeout; -BYTE CDB[16 ]; -}RequestBlock_struct ; typedef struct _ErrDescriptor_struct { QWORD Addr; DWORD Len;
@@ -244,28 +159,6 @@ typedef struct _SGDescriptor_struct {DWORD Ext; } SGDescriptor_struct; -typedef union _MoreErrInfo_struct { -struct { -BYTE Reserved[3 ]; -BYTE Type; -DWORD ErrorInfo; - }Common_Info; -struct { -BYTE Reserved[2 ]; -BYTE offense_size;/* size of offending entry */ -BYTE offense_num;/* byte # of offense 0-base */ -DWORD offense_value; - }Invalid_Cmd; -}MoreErrInfo_struct ; -typedef struct _ErrorInfo_struct { -BYTE ScsiStatus; -BYTE SenseLen; -HWORD CommandStatus; -DWORD ResidualCnt; -MoreErrInfo_struct MoreErrInfo; -BYTE SenseInfo[SENSEINFOBYTES ]; -}ErrorInfo_struct ; -/* Command types */ #define CMD_RWREQ 0x00#define CMD_IOCTL_PEND 0x01
include/linux/cciss_defs.h new file +130 -0
130 lines not on this page · raw message
include/linux/cciss_ioctl.h +1 -128
141 lines not on this page · raw message
Signature · 1 line
1.6.6.1
Re: [PATCH 2/2] cciss: Consolidate duplicate bits in cciss_cmd.h & cciss_ioctl.h
Quoted 6 lines · dann frazier
There are several duplicate definitions in
cciss_cmd.handcciss_ioctl.h. Consolidate these into the newcciss_defs.hfile. This patch doesn't change the definitions exposed underinclude/linux, so userspace apps shouldn't be affected.Signed-off-by dann frazier <[email protected]>
Quoted 4 lines · dann frazier
Some cleanup before the header file split-out so we don't propagate this style into new files.
Signed-off-by dann frazier <[email protected]>