aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/cciss.c
diff options
context:
space:
mode:
authordann frazier <dannf@hp.com>2010-02-17 18:53:31 -0500
committerJens Axboe <jens.axboe@oracle.com>2010-02-22 07:44:45 -0500
commitb028461d66a4dc2754d4e5dab1b3974c44798c5d (patch)
treed12b0275b3fd1af7d6c841ae053248d6efb57169 /drivers/block/cciss.c
parent488991e28e55b4fbca8067edf0259f69d1a6f92c (diff)
cciss: remove C99-style comments
Some cleanup before the header file split-out so we don't propagate this style into new files. Acked-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Signed-off-by: dann frazier <dannf@hp.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block/cciss.c')
-rw-r--r--drivers/block/cciss.c37
1 files changed, 19 insertions, 18 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 873e594860d3..8df23c732c46 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1341,26 +1341,27 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,
1341 kfree(buff); 1341 kfree(buff);
1342 return -ENOMEM; 1342 return -ENOMEM;
1343 } 1343 }
1344 // Fill in the command type 1344 /* Fill in the command type */
1345 c->cmd_type = CMD_IOCTL_PEND; 1345 c->cmd_type = CMD_IOCTL_PEND;
1346 // Fill in Command Header 1346 /* Fill in Command Header */
1347 c->Header.ReplyQueue = 0; // unused in simple mode 1347 c->Header.ReplyQueue = 0; /* unused in simple mode */
1348 if (iocommand.buf_size > 0) // buffer to fill 1348 if (iocommand.buf_size > 0) /* buffer to fill */
1349 { 1349 {
1350 c->Header.SGList = 1; 1350 c->Header.SGList = 1;
1351 c->Header.SGTotal = 1; 1351 c->Header.SGTotal = 1;
1352 } else // no buffers to fill 1352 } else /* no buffers to fill */
1353 { 1353 {
1354 c->Header.SGList = 0; 1354 c->Header.SGList = 0;
1355 c->Header.SGTotal = 0; 1355 c->Header.SGTotal = 0;
1356 } 1356 }
1357 c->Header.LUN = iocommand.LUN_info; 1357 c->Header.LUN = iocommand.LUN_info;
1358 c->Header.Tag.lower = c->busaddr; // use the kernel address the cmd block for tag 1358 /* use the kernel address the cmd block for tag */
1359 c->Header.Tag.lower = c->busaddr;
1359 1360
1360 // Fill in Request block 1361 /* Fill in Request block */
1361 c->Request = iocommand.Request; 1362 c->Request = iocommand.Request;
1362 1363
1363 // Fill in the scatter gather information 1364 /* Fill in the scatter gather information */
1364 if (iocommand.buf_size > 0) { 1365 if (iocommand.buf_size > 0) {
1365 temp64.val = pci_map_single(host->pdev, buff, 1366 temp64.val = pci_map_single(host->pdev, buff,
1366 iocommand.buf_size, 1367 iocommand.buf_size,
@@ -1368,7 +1369,7 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,
1368 c->SG[0].Addr.lower = temp64.val32.lower; 1369 c->SG[0].Addr.lower = temp64.val32.lower;
1369 c->SG[0].Addr.upper = temp64.val32.upper; 1370 c->SG[0].Addr.upper = temp64.val32.upper;
1370 c->SG[0].Len = iocommand.buf_size; 1371 c->SG[0].Len = iocommand.buf_size;
1371 c->SG[0].Ext = 0; // we are not chaining 1372 c->SG[0].Ext = 0; /* we are not chaining */
1372 } 1373 }
1373 c->waiting = &wait; 1374 c->waiting = &wait;
1374 1375
@@ -2422,7 +2423,7 @@ static int fill_cmd(CommandList_struct *c, __u8 cmd, int ctlr, void *buff,
2422 c->Request.Type.Direction = XFER_READ; 2423 c->Request.Type.Direction = XFER_READ;
2423 c->Request.Timeout = 0; 2424 c->Request.Timeout = 0;
2424 c->Request.CDB[0] = cmd; 2425 c->Request.CDB[0] = cmd;
2425 c->Request.CDB[6] = (size >> 24) & 0xFF; //MSB 2426 c->Request.CDB[6] = (size >> 24) & 0xFF; /* MSB */
2426 c->Request.CDB[7] = (size >> 16) & 0xFF; 2427 c->Request.CDB[7] = (size >> 16) & 0xFF;
2427 c->Request.CDB[8] = (size >> 8) & 0xFF; 2428 c->Request.CDB[8] = (size >> 8) & 0xFF;
2428 c->Request.CDB[9] = size & 0xFF; 2429 c->Request.CDB[9] = size & 0xFF;
@@ -2691,7 +2692,7 @@ static void cciss_geometry_inquiry(int ctlr, int logvol,
2691 "cciss: reading geometry failed, volume " 2692 "cciss: reading geometry failed, volume "
2692 "does not support reading geometry\n"); 2693 "does not support reading geometry\n");
2693 drv->heads = 255; 2694 drv->heads = 255;
2694 drv->sectors = 32; // Sectors per track 2695 drv->sectors = 32; /* Sectors per track */
2695 drv->cylinders = total_size + 1; 2696 drv->cylinders = total_size + 1;
2696 drv->raid_level = RAID_UNKNOWN; 2697 drv->raid_level = RAID_UNKNOWN;
2697 } else { 2698 } else {
@@ -3109,19 +3110,19 @@ static void do_cciss_request(struct request_queue *q)
3109 3110
3110 /* fill in the request */ 3111 /* fill in the request */
3111 drv = creq->rq_disk->private_data; 3112 drv = creq->rq_disk->private_data;
3112 c->Header.ReplyQueue = 0; // unused in simple mode 3113 c->Header.ReplyQueue = 0; /* unused in simple mode */
3113 /* got command from pool, so use the command block index instead */ 3114 /* got command from pool, so use the command block index instead */
3114 /* for direct lookups. */ 3115 /* for direct lookups. */
3115 /* The first 2 bits are reserved for controller error reporting. */ 3116 /* The first 2 bits are reserved for controller error reporting. */
3116 c->Header.Tag.lower = (c->cmdindex << 3); 3117 c->Header.Tag.lower = (c->cmdindex << 3);
3117 c->Header.Tag.lower |= 0x04; /* flag for direct lookup. */ 3118 c->Header.Tag.lower |= 0x04; /* flag for direct lookup. */
3118 memcpy(&c->Header.LUN, drv->LunID, sizeof(drv->LunID)); 3119 memcpy(&c->Header.LUN, drv->LunID, sizeof(drv->LunID));
3119 c->Request.CDBLen = 10; // 12 byte commands not in FW yet; 3120 c->Request.CDBLen = 10; /* 12 byte commands not in FW yet; */
3120 c->Request.Type.Type = TYPE_CMD; // It is a command. 3121 c->Request.Type.Type = TYPE_CMD; /* It is a command. */
3121 c->Request.Type.Attribute = ATTR_SIMPLE; 3122 c->Request.Type.Attribute = ATTR_SIMPLE;
3122 c->Request.Type.Direction = 3123 c->Request.Type.Direction =
3123 (rq_data_dir(creq) == READ) ? XFER_READ : XFER_WRITE; 3124 (rq_data_dir(creq) == READ) ? XFER_READ : XFER_WRITE;
3124 c->Request.Timeout = 0; // Don't time out 3125 c->Request.Timeout = 0; /* Don't time out */
3125 c->Request.CDB[0] = 3126 c->Request.CDB[0] =
3126 (rq_data_dir(creq) == READ) ? h->cciss_read : h->cciss_write; 3127 (rq_data_dir(creq) == READ) ? h->cciss_read : h->cciss_write;
3127 start_blk = blk_rq_pos(creq); 3128 start_blk = blk_rq_pos(creq);
@@ -3206,11 +3207,11 @@ static void do_cciss_request(struct request_queue *q)
3206 if (likely(blk_fs_request(creq))) { 3207 if (likely(blk_fs_request(creq))) {
3207 if(h->cciss_read == CCISS_READ_10) { 3208 if(h->cciss_read == CCISS_READ_10) {
3208 c->Request.CDB[1] = 0; 3209 c->Request.CDB[1] = 0;
3209 c->Request.CDB[2] = (start_blk >> 24) & 0xff; //MSB 3210 c->Request.CDB[2] = (start_blk >> 24) & 0xff; /* MSB */
3210 c->Request.CDB[3] = (start_blk >> 16) & 0xff; 3211 c->Request.CDB[3] = (start_blk >> 16) & 0xff;
3211 c->Request.CDB[4] = (start_blk >> 8) & 0xff; 3212 c->Request.CDB[4] = (start_blk >> 8) & 0xff;
3212 c->Request.CDB[5] = start_blk & 0xff; 3213 c->Request.CDB[5] = start_blk & 0xff;
3213 c->Request.CDB[6] = 0; // (sect >> 24) & 0xff; MSB 3214 c->Request.CDB[6] = 0; /* (sect >> 24) & 0xff; MSB */
3214 c->Request.CDB[7] = (blk_rq_sectors(creq) >> 8) & 0xff; 3215 c->Request.CDB[7] = (blk_rq_sectors(creq) >> 8) & 0xff;
3215 c->Request.CDB[8] = blk_rq_sectors(creq) & 0xff; 3216 c->Request.CDB[8] = blk_rq_sectors(creq) & 0xff;
3216 c->Request.CDB[9] = c->Request.CDB[11] = c->Request.CDB[12] = 0; 3217 c->Request.CDB[9] = c->Request.CDB[11] = c->Request.CDB[12] = 0;
@@ -3219,7 +3220,7 @@ static void do_cciss_request(struct request_queue *q)
3219 3220
3220 c->Request.CDBLen = 16; 3221 c->Request.CDBLen = 16;
3221 c->Request.CDB[1]= 0; 3222 c->Request.CDB[1]= 0;
3222 c->Request.CDB[2]= (upper32 >> 24) & 0xff; //MSB 3223 c->Request.CDB[2]= (upper32 >> 24) & 0xff; /* MSB */
3223 c->Request.CDB[3]= (upper32 >> 16) & 0xff; 3224 c->Request.CDB[3]= (upper32 >> 16) & 0xff;
3224 c->Request.CDB[4]= (upper32 >> 8) & 0xff; 3225 c->Request.CDB[4]= (upper32 >> 8) & 0xff;
3225 c->Request.CDB[5]= upper32 & 0xff; 3226 c->Request.CDB[5]= upper32 & 0xff;