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

Commit b2a4a43d authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by Jens Axboe
Browse files

cciss: change printks to dev_warn, etc. 



cciss: change printks to dev_warn, etc.

Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 6b4d96b8

drivers/block/cciss.c

+138 −176

File changed.

Preview size limit exceeded, changes collapsed.

drivers/block/cciss_scsi.c

+74 −85
Original line number Diff line number Diff line
@@ -192,7 +192,8 @@ scsi_cmd_free(ctlr_info_t *h, CommandList_struct *c) 
	stk = &sa->cmd_stack; 

	stk->top++;

	if (stk->top >= CMD_STACK_SIZE) {

		printk("cciss: scsi_cmd_free called too many times.\n");

		dev_err(&h->pdev->dev,

			"scsi_cmd_free called too many times.\n");

		BUG();

	}

	stk->elem[stk->top] = (struct cciss_scsi_cmd_stack_elem_t *) c;
@@ -245,10 +246,9 @@ scsi_cmd_stack_free(ctlr_info_t *h) 
	sa = h->scsi_ctlr;

	stk = &sa->cmd_stack; 

	if (stk->top != CMD_STACK_SIZE-1) {

		printk( "cciss: %d scsi commands are still outstanding.\n",

		dev_warn(&h->pdev->dev,

			"bug: %d scsi commands are still outstanding.\n",

			CMD_STACK_SIZE - stk->top);

		// BUG();

		printk("WE HAVE A BUG HERE!!! stk=0x%p\n", stk);

	}

	size = sizeof(struct cciss_scsi_cmd_stack_elem_t) * CMD_STACK_SIZE;
@@ -382,8 +382,8 @@ cciss_scsi_add_entry(ctlr_info_t *h, int hostno, 
	unsigned char addr1[8], addr2[8];



	if (n >= CCISS_MAX_SCSI_DEVS_PER_HBA) {

		printk("cciss%d: Too many devices, "

			"some will be inaccessible.\n", h->ctlr);

		dev_warn(&h->pdev->dev, "Too many devices, "

			"some will be inaccessible.\n");

		return -1;

	}
@@ -439,8 +439,8 @@ cciss_scsi_add_entry(ctlr_info_t *h, int hostno, 
	   know our hostno and we don't want to print anything first 

	   time anyway (the scsi layer's inquiries will show that info) */

	if (hostno != -1)

		printk("cciss%d: %s device c%db%dt%dl%d added.\n", 

			h->ctlr, scsi_device_type(sd->devtype), hostno,

		dev_info(&h->pdev->dev, "%s device c%db%dt%dl%d added.\n",

			scsi_device_type(sd->devtype), hostno,

			sd->bus, sd->target, sd->lun);

	return 0;

}
@@ -462,8 +462,8 @@ cciss_scsi_remove_entry(ctlr_info_t *h, int hostno, int entry, 
	for (i = entry; i < ccissscsi[h->ctlr].ndevices-1; i++)

		ccissscsi[h->ctlr].dev[i] = ccissscsi[h->ctlr].dev[i+1];

	ccissscsi[h->ctlr].ndevices--;

	printk("cciss%d: %s device c%db%dt%dl%d removed.\n",

		h->ctlr, scsi_device_type(sd.devtype), hostno,

	dev_info(&h->pdev->dev, "%s device c%db%dt%dl%d removed.\n",

		scsi_device_type(sd.devtype), hostno,

			sd.bus, sd.target, sd.lun);

}
@@ -536,8 +536,8 @@ adjust_cciss_scsi_table(ctlr_info_t *h, int hostno, 
			GFP_KERNEL);



	if (!added || !removed) {

		printk(KERN_WARNING "cciss%d: Out of memory in "

			"adjust_cciss_scsi_table\n", h->ctlr);

		dev_warn(&h->pdev->dev,

			"Out of memory in adjust_cciss_scsi_table\n");

		goto free_and_out;

	}
@@ -568,17 +568,14 @@ adjust_cciss_scsi_table(ctlr_info_t *h, int hostno, 


		if (found == 0) { /* device no longer present. */ 

			changes++;

			/* printk("cciss%d: %s device c%db%dt%dl%d removed.\n",

				h->ctlr, scsi_device_type(csd->devtype), hostno,

					csd->bus, csd->target, csd->lun); */

			cciss_scsi_remove_entry(h, hostno, i,

				removed, &nremoved);

			/* remove ^^^, hence i not incremented */

		} else if (found == 1) { /* device is different in some way */

			changes++;

			printk("cciss%d: device c%db%dt%dl%d has changed.\n",

				h->ctlr, hostno,

				csd->bus, csd->target, csd->lun);

			dev_info(&h->pdev->dev,

				"device c%db%dt%dl%d has changed.\n",

				hostno, csd->bus, csd->target, csd->lun);

			cciss_scsi_remove_entry(h, hostno, i,

				removed, &nremoved);

			/* remove ^^^, hence i not incremented */
@@ -623,8 +620,8 @@ adjust_cciss_scsi_table(ctlr_info_t *h, int hostno, 
		} else if (found == 1) {

			/* should never happen... */

			changes++;

			printk(KERN_WARNING "cciss%d: device "

				"unexpectedly changed\n", h->ctlr);

			dev_warn(&h->pdev->dev,

				"device unexpectedly changed\n");

			/* but if it does happen, we just ignore that device */

		}

	}
@@ -648,9 +645,9 @@ adjust_cciss_scsi_table(ctlr_info_t *h, int hostno, 
			/* We don't expect to get here. */

			/* future cmds to this device will get selection */

			/* timeout as if the device was gone. */

			printk(KERN_WARNING "cciss%d: didn't find "

			dev_warn(&h->pdev->dev, "didn't find "

				"c%db%dt%dl%d\n for removal.",

				h->ctlr, hostno, removed[i].bus,

				hostno, removed[i].bus,

				removed[i].target, removed[i].lun);

		}

	}
@@ -662,10 +659,9 @@ adjust_cciss_scsi_table(ctlr_info_t *h, int hostno, 
			added[i].target, added[i].lun);

		if (rc == 0)

			continue;

		printk(KERN_WARNING "cciss%d: scsi_add_device "

		dev_warn(&h->pdev->dev, "scsi_add_device "

			"c%db%dt%dl%d failed, device not added.\n",

			h->ctlr, hostno,

			added[i].bus, added[i].target, added[i].lun);

			hostno, added[i].bus, added[i].target, added[i].lun);

		/* now we have to remove it from ccissscsi, */

		/* since it didn't get added to scsi mid layer */

		fixup_botched_add(h, added[i].scsi3addr);
@@ -788,7 +784,7 @@ static void complete_scsi_command(CommandList_struct *c, int timeout, 
			case CMD_DATA_UNDERRUN: /* let mid layer handle it. */

			break;

			case CMD_DATA_OVERRUN:

				printk(KERN_WARNING "cciss: %p has"

				dev_warn(&h->pdev->dev, "%p has"

					" completed with data overrun "

					"reported\n", c);

			break;
@@ -804,43 +800,41 @@ static void complete_scsi_command(CommandList_struct *c, int timeout, 
				}

			break;

			case CMD_PROTOCOL_ERR:

				printk(KERN_WARNING "cciss: %p has "

					"protocol error\n", c);

				dev_warn(&h->pdev->dev,

					"%p has protocol error\n", c);

                        break;

			case CMD_HARDWARE_ERR:

				cmd->result = DID_ERROR << 16;

				printk(KERN_WARNING "cciss: %p had "

					" hardware error\n", c);

				dev_warn(&h->pdev->dev,

					"%p had hardware error\n", c);

                        break;

			case CMD_CONNECTION_LOST:

				cmd->result = DID_ERROR << 16;

				printk(KERN_WARNING "cciss: %p had "

					"connection lost\n", c);

				dev_warn(&h->pdev->dev,

					"%p had connection lost\n", c);

			break;

			case CMD_ABORTED:

				cmd->result = DID_ABORT << 16;

				printk(KERN_WARNING "cciss: %p was "

					"aborted\n", c);

				dev_warn(&h->pdev->dev, "%p was aborted\n", c);

			break;

			case CMD_ABORT_FAILED:

				cmd->result = DID_ERROR << 16;

				printk(KERN_WARNING "cciss: %p reports "

					"abort failed\n", c);

				dev_warn(&h->pdev->dev,

					"%p reports abort failed\n", c);

			break;

			case CMD_UNSOLICITED_ABORT:

				cmd->result = DID_ABORT << 16;

				printk(KERN_WARNING "cciss: %p aborted "

					"do to an unsolicited abort\n", c);

				dev_warn(&h->pdev->dev, "%p aborted do to an "

					"unsolicited abort\n", c);

			break;

			case CMD_TIMEOUT:

				cmd->result = DID_TIME_OUT << 16;

				printk(KERN_WARNING "cciss: %p timedout\n",

					c);

				dev_warn(&h->pdev->dev, "%p timedout\n", c);

			break;

			default:

				cmd->result = DID_ERROR << 16;

				printk(KERN_WARNING "cciss: %p returned "

					"unknown status %x\n", c,

				dev_warn(&h->pdev->dev,

					"%p returned unknown status %x\n", c,

						ei->CommandStatus); 

		}

	}
@@ -956,7 +950,7 @@ cciss_scsi_do_simple_cmd(ctlr_info_t *h, 
}



static void 

cciss_scsi_interpret_error(CommandList_struct *c)

cciss_scsi_interpret_error(ctlr_info_t *h, CommandList_struct *c)

{

	ErrorInfo_struct *ei;
@@ -964,67 +958,64 @@ cciss_scsi_interpret_error(CommandList_struct *c) 
	switch(ei->CommandStatus)

	{

		case CMD_TARGET_STATUS:

			printk(KERN_WARNING "cciss: cmd %p has "

				"completed with errors\n", c);

			printk(KERN_WARNING "cciss: cmd %p "

				"has SCSI Status = %x\n",

			dev_warn(&h->pdev->dev,

				"cmd %p has completed with errors\n", c);

			dev_warn(&h->pdev->dev,

				"cmd %p has SCSI Status = %x\n",

				c, ei->ScsiStatus);

			if (ei->ScsiStatus == 0)

				printk(KERN_WARNING 

				"cciss:SCSI status is abnormally zero.  "

				dev_warn(&h->pdev->dev,

				"SCSI status is abnormally zero.  "

				"(probably indicates selection timeout "

				"reported incorrectly due to a known "

				"firmware bug, circa July, 2001.)\n");

		break;

		case CMD_DATA_UNDERRUN: /* let mid layer handle it. */

			printk("UNDERRUN\n");

			dev_info(&h->pdev->dev, "UNDERRUN\n");

		break;

		case CMD_DATA_OVERRUN:

			printk(KERN_WARNING "cciss: %p has"

			dev_warn(&h->pdev->dev, "%p has"

				" completed with data overrun "

				"reported\n", c);

		break;

		case CMD_INVALID: {

			/* controller unfortunately reports SCSI passthru's */

			/* to non-existent targets as invalid commands. */

			printk(KERN_WARNING "cciss: %p is "

				"reported invalid (probably means "

			dev_warn(&h->pdev->dev,

				"%p is reported invalid (probably means "

				"target device no longer present)\n", c);

			/* print_bytes((unsigned char *) c, sizeof(*c), 1, 0);

			print_cmd(c);  */

			}

		break;

		case CMD_PROTOCOL_ERR:

			printk(KERN_WARNING "cciss: %p has "

				"protocol error\n", c);

			dev_warn(&h->pdev->dev, "%p has protocol error\n", c);

		break;

		case CMD_HARDWARE_ERR:

			/* cmd->result = DID_ERROR << 16; */

			printk(KERN_WARNING "cciss: %p had "

				" hardware error\n", c);

			dev_warn(&h->pdev->dev, "%p had hardware error\n", c);

		break;

		case CMD_CONNECTION_LOST:

			printk(KERN_WARNING "cciss: %p had "

				"connection lost\n", c);

			dev_warn(&h->pdev->dev, "%p had connection lost\n", c);

		break;

		case CMD_ABORTED:

			printk(KERN_WARNING "cciss: %p was "

				"aborted\n", c);

			dev_warn(&h->pdev->dev, "%p was aborted\n", c);

		break;

		case CMD_ABORT_FAILED:

			printk(KERN_WARNING "cciss: %p reports "

				"abort failed\n", c);

			dev_warn(&h->pdev->dev,

				"%p reports abort failed\n", c);

		break;

		case CMD_UNSOLICITED_ABORT:

			printk(KERN_WARNING "cciss: %p aborted "

				"do to an unsolicited abort\n", c);

			dev_warn(&h->pdev->dev,

				"%p aborted do to an unsolicited abort\n", c);

		break;

		case CMD_TIMEOUT:

			printk(KERN_WARNING "cciss: %p timedout\n", c);

			dev_warn(&h->pdev->dev, "%p timedout\n", c);

		break;

		default:

			printk(KERN_WARNING "cciss: %p returned "

				"unknown status %x\n", c, ei->CommandStatus);

			dev_warn(&h->pdev->dev,

				"%p returned unknown status %x\n",

				c, ei->CommandStatus);

	}

}
@@ -1063,7 +1054,7 @@ cciss_scsi_do_inquiry(ctlr_info_t *h, unsigned char *scsi3addr, 


	if (ei->CommandStatus != 0 && 

	    ei->CommandStatus != CMD_DATA_UNDERRUN) {

		cciss_scsi_interpret_error(c);

		cciss_scsi_interpret_error(h, c);

		rc = -1;

	}

	spin_lock_irqsave(&h->lock, flags);
@@ -1134,7 +1125,7 @@ cciss_scsi_do_report_phys_luns(ctlr_info_t *h, 
	ei = c->err_info;

	if (ei->CommandStatus != 0 && 

	    ei->CommandStatus != CMD_DATA_UNDERRUN) {

		cciss_scsi_interpret_error(c);

		cciss_scsi_interpret_error(h, c);

		rc = -1;

	}

	spin_lock_irqsave(&h->lock, flags);
@@ -1446,7 +1437,7 @@ cciss_scsi_queue_command (struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd 
	c = scsi_cmd_alloc(h);

	spin_unlock_irqrestore(&h->lock, flags);

	if (c == NULL) {			/* trouble... */

		printk("scsi_cmd_alloc returned NULL!\n");

		dev_warn(&h->pdev->dev, "scsi_cmd_alloc returned NULL!\n");

		/* FIXME: next 3 lines are -> BAD! <- */

		cmd->result = DID_NO_CONNECT << 16;

		done(cmd);
@@ -1502,7 +1493,7 @@ cciss_scsi_queue_command (struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd 
		break;



	  default: 

		printk("cciss: unknown data direction: %d\n", 

		dev_warn(&h->pdev->dev, "unknown data direction: %d\n",

			cmd->sc_data_direction);

		BUG();

		break;
@@ -1552,8 +1543,7 @@ static int cciss_engage_scsi(ctlr_info_t *h) 
	stk = &sa->cmd_stack; 



	if (sa->registered) {

		printk(KERN_INFO "cciss%d: SCSI subsystem already engaged.\n",

			h->ctlr);

		dev_info(&h->pdev->dev, "SCSI subsystem already engaged.\n");

		spin_unlock_irqrestore(&h->lock, flags);

		return -ENXIO;

	}
@@ -1586,8 +1576,8 @@ static int wait_for_device_to_become_ready(ctlr_info_t *h, 


	c = cmd_alloc(h);

	if (!c) {

		printk(KERN_WARNING "cciss%d: out of memory in "

			"wait_for_device_to_become_ready.\n", h->ctlr);

		dev_warn(&h->pdev->dev, "out of memory in "

			"wait_for_device_to_become_ready.\n");

		return IO_ERROR;

	}
@@ -1631,16 +1621,16 @@ static int wait_for_device_to_become_ready(ctlr_info_t *h, 
			}

		}

retry_tur:

		printk(KERN_WARNING "cciss%d: Waiting %d secs "

		dev_warn(&h->pdev->dev, "Waiting %d secs "

			"for device to become ready.\n",

			h->ctlr, waittime / HZ);

			waittime / HZ);

		rc = 1; /* device not ready. */

	}



	if (rc)

		printk("cciss%d: giving up on device.\n", h->ctlr);

		dev_warn(&h->pdev->dev, "giving up on device.\n");

	else

		printk(KERN_WARNING "cciss%d: device is ready.\n", h->ctlr);

		dev_warn(&h->pdev->dev, "device is ready.\n");



	cmd_free(h, c);

	return rc;
@@ -1668,8 +1658,7 @@ static int cciss_eh_device_reset_handler(struct scsi_cmnd *scsicmd) 
	h = (ctlr_info_t *) scsicmd->device->host->hostdata[0];

	if (h == NULL) /* paranoia */

		return FAILED;

	printk(KERN_WARNING

		"cciss%d: resetting tape drive or medium changer.\n", h->ctlr);

	dev_warn(&h->pdev->dev, "resetting tape drive or medium changer.\n");

	/* find the command that's giving us trouble */

	cmd_in_trouble = (CommandList_struct *) scsicmd->host_scribble;

	if (cmd_in_trouble == NULL) /* paranoia */
@@ -1680,7 +1669,7 @@ static int cciss_eh_device_reset_handler(struct scsi_cmnd *scsicmd) 
		TYPE_MSG);

	if (rc == 0 && wait_for_device_to_become_ready(h, lunaddr) == 0)

		return SUCCESS;

	printk(KERN_WARNING "cciss%d: resetting device failed.\n", h->ctlr);

	dev_warn(&h->pdev->dev, "resetting device failed.\n");

	return FAILED;

}
@@ -1695,7 +1684,7 @@ static int cciss_eh_abort_handler(struct scsi_cmnd *scsicmd) 
	h = (ctlr_info_t *) scsicmd->device->host->hostdata[0];

	if (h == NULL) /* paranoia */

		return FAILED;

	printk(KERN_WARNING "cciss%d: aborting tardy SCSI cmd\n", h->ctlr);

	dev_warn(&h->pdev->dev, "aborting tardy SCSI cmd\n");



	/* find the command to be aborted */

	cmd_to_abort = (CommandList_struct *) scsicmd->host_scribble;