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

Commit f0761be3 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata-scsi: clean up inquiry / mode sense related functions 



* make ata_scsiop_*() static
* make ata_scsi_set_sense() static and move it above its users
* make ata_scsi_rbuf_fill() static
* kill unused ata_scsi_badcmd()

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 3dd654bf

drivers/ata/libata-scsi.c

+21 −68
Original line number Diff line number Diff line
@@ -179,6 +179,13 @@ DEVICE_ATTR(link_power_management_policy, S_IRUGO | S_IWUSR, 
		ata_scsi_lpm_show, ata_scsi_lpm_put);

EXPORT_SYMBOL_GPL(dev_attr_link_power_management_policy);



static void ata_scsi_set_sense(struct scsi_cmnd *cmd, u8 sk, u8 asc, u8 ascq)

{

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



	scsi_build_sense_buffer(0, cmd->sense_buffer, sk, asc, ascq);

}



static void ata_scsi_invalid_field(struct scsi_cmnd *cmd,

				   void (*done)(struct scsi_cmnd *))

{
@@ -1696,8 +1703,7 @@ static inline void ata_scsi_rbuf_put(struct scsi_cmnd *cmd, u8 *buf) 
 *	LOCKING:

 *	spin_lock_irqsave(host lock)

 */



void ata_scsi_rbuf_fill(struct ata_scsi_args *args,

static void ata_scsi_rbuf_fill(struct ata_scsi_args *args,

			unsigned int (*actor)(struct ata_scsi_args *args,

					      u8 *rbuf, unsigned int buflen))

{
@@ -1748,8 +1754,7 @@ void ata_scsi_rbuf_fill(struct ata_scsi_args *args, 
 *	LOCKING:

 *	spin_lock_irqsave(host lock)

 */



unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf,

static unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf,

				       unsigned int buflen)

{

	u8 hdr[] = {
@@ -1804,8 +1809,7 @@ unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf, 
 *	LOCKING:

 *	spin_lock_irqsave(host lock)

 */



unsigned int ata_scsiop_inq_00(struct ata_scsi_args *args, u8 *rbuf,

static unsigned int ata_scsiop_inq_00(struct ata_scsi_args *args, u8 *rbuf,

				      unsigned int buflen)

{

	const u8 pages[] = {
@@ -1832,8 +1836,7 @@ unsigned int ata_scsiop_inq_00(struct ata_scsi_args *args, u8 *rbuf, 
 *	LOCKING:

 *	spin_lock_irqsave(host lock)

 */



unsigned int ata_scsiop_inq_80(struct ata_scsi_args *args, u8 *rbuf,

static unsigned int ata_scsiop_inq_80(struct ata_scsi_args *args, u8 *rbuf,

				      unsigned int buflen)

{

	const u8 hdr[] = {
@@ -1865,8 +1868,7 @@ unsigned int ata_scsiop_inq_80(struct ata_scsi_args *args, u8 *rbuf, 
 *	LOCKING:

 *	spin_lock_irqsave(host lock)

 */



unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf,

static unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf,

				      unsigned int buflen)

{

	int num;
@@ -1915,7 +1917,6 @@ unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf, 
 *	LOCKING:

 *	spin_lock_irqsave(host lock)

 */



static unsigned int ata_scsiop_inq_89(struct ata_scsi_args *args, u8 *rbuf,

				      unsigned int buflen)

{
@@ -1972,8 +1973,7 @@ static unsigned int ata_scsiop_inq_89(struct ata_scsi_args *args, u8 *rbuf, 
 *	LOCKING:

 *	spin_lock_irqsave(host lock)

 */



unsigned int ata_scsiop_noop(struct ata_scsi_args *args, u8 *rbuf,

static unsigned int ata_scsiop_noop(struct ata_scsi_args *args, u8 *rbuf,

				    unsigned int buflen)

{

	VPRINTK("ENTER\n");
@@ -2312,53 +2312,6 @@ unsigned int ata_scsiop_report_luns(struct ata_scsi_args *args, u8 *rbuf, 
	return 0;

}



/**

 *	ata_scsi_set_sense - Set SCSI sense data and status

 *	@cmd: SCSI request to be handled

 *	@sk: SCSI-defined sense key

 *	@asc: SCSI-defined additional sense code

 *	@ascq: SCSI-defined additional sense code qualifier

 *

 *	Helper function that builds a valid fixed format, current

 *	response code and the given sense key (sk), additional sense

 *	code (asc) and additional sense code qualifier (ascq) with

 *	a SCSI command status of %SAM_STAT_CHECK_CONDITION and

 *	DRIVER_SENSE set in the upper bits of scsi_cmnd::result .

 *

 *	LOCKING:

 *	Not required

 */



void ata_scsi_set_sense(struct scsi_cmnd *cmd, u8 sk, u8 asc, u8 ascq)

{

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



	scsi_build_sense_buffer(0, cmd->sense_buffer, sk, asc, ascq);

}



/**

 *	ata_scsi_badcmd - End a SCSI request with an error

 *	@cmd: SCSI request to be handled

 *	@done: SCSI command completion function

 *	@asc: SCSI-defined additional sense code

 *	@ascq: SCSI-defined additional sense code qualifier

 *

 *	Helper function that completes a SCSI command with

 *	%SAM_STAT_CHECK_CONDITION, with a sense key %ILLEGAL_REQUEST

 *	and the specified additional sense codes.

 *

 *	LOCKING:

 *	spin_lock_irqsave(host lock)

 */



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

{

	DPRINTK("ENTER\n");

	ata_scsi_set_sense(cmd, ILLEGAL_REQUEST, asc, ascq);



	done(cmd);

}



static void atapi_sense_complete(struct ata_queued_cmd *qc)

{

	if (qc->err_mask && ((qc->err_mask & AC_ERR_DEV) == 0)) {

drivers/ata/libata.h

+0 −28
Original line number Diff line number Diff line
@@ -146,34 +146,6 @@ extern void ata_scsi_scan_host(struct ata_port *ap, int sync); 
extern int ata_scsi_offline_dev(struct ata_device *dev);

extern void ata_scsi_media_change_notify(struct ata_device *dev);

extern void ata_scsi_hotplug(struct work_struct *work);

extern unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf,

			       unsigned int buflen);



extern unsigned int ata_scsiop_inq_00(struct ata_scsi_args *args, u8 *rbuf,

			      unsigned int buflen);



extern unsigned int ata_scsiop_inq_80(struct ata_scsi_args *args, u8 *rbuf,

			      unsigned int buflen);

extern unsigned int ata_scsiop_inq_83(struct ata_scsi_args *args, u8 *rbuf,

			      unsigned int buflen);

extern unsigned int ata_scsiop_noop(struct ata_scsi_args *args, u8 *rbuf,

			    unsigned int buflen);

extern unsigned int ata_scsiop_sync_cache(struct ata_scsi_args *args, u8 *rbuf,

				  unsigned int buflen);

extern unsigned int ata_scsiop_mode_sense(struct ata_scsi_args *args, u8 *rbuf,

				  unsigned int buflen);

extern unsigned int ata_scsiop_read_cap(struct ata_scsi_args *args, u8 *rbuf,

			        unsigned int buflen);

extern unsigned int ata_scsiop_report_luns(struct ata_scsi_args *args, u8 *rbuf,

				   unsigned int buflen);

extern void ata_scsi_badcmd(struct scsi_cmnd *cmd,

			    void (*done)(struct scsi_cmnd *),

			    u8 asc, u8 ascq);

extern void ata_scsi_set_sense(struct scsi_cmnd *cmd,

			       u8 sk, u8 asc, u8 ascq);

extern void ata_scsi_rbuf_fill(struct ata_scsi_args *args,

                        unsigned int (*actor) (struct ata_scsi_args *args,

                                           u8 *rbuf, unsigned int buflen));

extern void ata_schedule_scsi_eh(struct Scsi_Host *shost);

extern void ata_scsi_dev_rescan(struct work_struct *work);

extern int ata_bus_probe(struct ata_port *ap);