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

Commit e12669e7 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

libata: minor cleanups 

A few code shuffles, to make merging future code easier.

Add (DRIVER_SENSE << 24) to certain result codes, as noted by Douglas
Gilbert.
parent 8a70f8dc

drivers/scsi/libata-core.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -3131,14 +3131,14 @@ void ata_eng_timeout(struct ata_port *ap) 
	DPRINTK("ENTER\n");

	DPRINTK("ENTER\n");





	qc = ata_qc_from_tag(ap, ap->active_tag);

	qc = ata_qc_from_tag(ap, ap->active_tag);

	if (!qc) {

	if (qc)

		ata_qc_timeout(qc);

	else {

		printk(KERN_ERR "ata%u: BUG: timeout without command\n",

		printk(KERN_ERR "ata%u: BUG: timeout without command\n",

		       ap->id);

		       ap->id);

		goto out;

		goto out;

	}

	}





	ata_qc_timeout(qc);



out:

out:

	DPRINTK("EXIT\n");

	DPRINTK("EXIT\n");

}

}

drivers/scsi/libata-scsi.c

+8 −4
Original line number Original line Diff line number Diff line
@@ -225,7 +225,7 @@ void ata_to_sense_error(struct ata_queued_cmd *qc, u8 drv_stat) 
	};

	};

	int i = 0;

	int i = 0;





	cmd->result = SAM_STAT_CHECK_CONDITION;

	cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;





	/*

	/*

	 *	Is this an error we can process/parse

	 *	Is this an error we can process/parse
@@ -1468,7 +1468,7 @@ unsigned int ata_scsiop_report_luns(struct ata_scsi_args *args, u8 *rbuf, 
void ata_scsi_badcmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *), u8 asc, u8 ascq)

void ata_scsi_badcmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *), u8 asc, u8 ascq)

{

{

	DPRINTK("ENTER\n");

	DPRINTK("ENTER\n");

	cmd->result = SAM_STAT_CHECK_CONDITION;

	cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;





	cmd->sense_buffer[0] = 0x70;

	cmd->sense_buffer[0] = 0x70;

	cmd->sense_buffer[2] = ILLEGAL_REQUEST;

	cmd->sense_buffer[2] = ILLEGAL_REQUEST;
@@ -1529,8 +1529,11 @@ static int atapi_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat) 
{

{

	struct scsi_cmnd *cmd = qc->scsicmd;

	struct scsi_cmnd *cmd = qc->scsicmd;





	VPRINTK("ENTER, drv_stat == 0x%x\n", drv_stat);



	if (unlikely(drv_stat & (ATA_BUSY | ATA_DRQ)))

	if (unlikely(drv_stat & (ATA_BUSY | ATA_DRQ)))

		ata_to_sense_error(qc, drv_stat);

		ata_to_sense_error(qc, drv_stat);



	else if (unlikely(drv_stat & ATA_ERR)) {

	else if (unlikely(drv_stat & ATA_ERR)) {

		DPRINTK("request check condition\n");

		DPRINTK("request check condition\n");
@@ -1546,7 +1549,9 @@ static int atapi_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat) 
		qc->scsidone(cmd);

		qc->scsidone(cmd);





		return 1;

		return 1;

	} else {

	}



	else {

		u8 *scsicmd = cmd->cmnd;

		u8 *scsicmd = cmd->cmnd;





		if (scsicmd[0] == INQUIRY) {

		if (scsicmd[0] == INQUIRY) {
@@ -1578,7 +1583,6 @@ static int atapi_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat) 
	}

	}





	qc->scsidone(cmd);

	qc->scsidone(cmd);



	return 0;

	return 0;

}

}

/**

/**