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

libata: uninline atapi_cmd_type() 



Uninline atapi_cmd_type().  It doesn't really have to be inline and
more case will be added which need to access unexported libata
variable.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent a4ba7fe2

drivers/ata/libata-core.c

+34 −0
Original line number Diff line number Diff line
@@ -325,6 +325,39 @@ static void ata_force_horkage(struct ata_device *dev) 
	}

}



/**

 *	atapi_cmd_type - Determine ATAPI command type from SCSI opcode

 *	@opcode: SCSI opcode

 *

 *	Determine ATAPI command type from @opcode.

 *

 *	LOCKING:

 *	None.

 *

 *	RETURNS:

 *	ATAPI_{READ|WRITE|READ_CD|PASS_THRU|MISC}

 */

int atapi_cmd_type(u8 opcode)

{

	switch (opcode) {

	case GPCMD_READ_10:

	case GPCMD_READ_12:

		return ATAPI_READ;



	case GPCMD_WRITE_10:

	case GPCMD_WRITE_12:

	case GPCMD_WRITE_AND_VERIFY_10:

		return ATAPI_WRITE;



	case GPCMD_READ_CD:

	case GPCMD_READ_CD_MSF:

		return ATAPI_READ_CD;



	default:

		return ATAPI_MISC;

	}

}



/**

 *	ata_tf_to_fis - Convert ATA taskfile to SATA FIS structure

 *	@tf: Taskfile to convert
@@ -7774,6 +7807,7 @@ EXPORT_SYMBOL_GPL(ata_tf_read); 
EXPORT_SYMBOL_GPL(ata_noop_dev_select);

EXPORT_SYMBOL_GPL(ata_std_dev_select);

EXPORT_SYMBOL_GPL(sata_print_link_status);

EXPORT_SYMBOL_GPL(atapi_cmd_type);

EXPORT_SYMBOL_GPL(ata_tf_to_fis);

EXPORT_SYMBOL_GPL(ata_tf_from_fis);

EXPORT_SYMBOL_GPL(ata_pack_xfermask);

include/linux/libata.h

+1 −21
Original line number Diff line number Diff line
@@ -849,6 +849,7 @@ extern unsigned int ata_dev_try_classify(struct ata_device *dev, int present, 
 */

extern void ata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf);

extern void ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf);

extern int atapi_cmd_type(u8 opcode);

extern void ata_tf_to_fis(const struct ata_taskfile *tf,

			  u8 pmp, int is_cmd, u8 *fis);

extern void ata_tf_from_fis(const u8 *fis, struct ata_taskfile *tf);
@@ -1379,27 +1380,6 @@ static inline int ata_try_flush_cache(const struct ata_device *dev) 
	       ata_id_has_flush_ext(dev->id);

}



static inline int atapi_cmd_type(u8 opcode)

{

	switch (opcode) {

	case GPCMD_READ_10:

	case GPCMD_READ_12:

		return ATAPI_READ;



	case GPCMD_WRITE_10:

	case GPCMD_WRITE_12:

	case GPCMD_WRITE_AND_VERIFY_10:

		return ATAPI_WRITE;



	case GPCMD_READ_CD:

	case GPCMD_READ_CD_MSF:

		return ATAPI_READ_CD;



	default:

		return ATAPI_MISC;

	}

}



static inline unsigned int ac_err_mask(u8 status)

{

	if (status & (ATA_BUSY | ATA_DRQ))