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

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

libata: kill ata_noop_dev_select() 



Now that SFF assumptions are separated out from non-SFF reset
sequence, port_ops->sff_dev_select() is no longer necessary for
non-SFF controllers.  Kill ata_noop_dev_select() and ->sff_dev_select
initialization from base and other non-SFF port_ops.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
parent 520d06f9

drivers/ata/libata-core.c

+0 −19
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ const struct ata_port_operations sata_port_ops = { 


	.qc_defer		= ata_std_qc_defer,

	.hardreset		= sata_std_hardreset,

	.sff_dev_select		= ata_noop_dev_select,

};



const struct ata_port_operations sata_pmp_port_ops = {
@@ -1431,22 +1430,6 @@ static int ata_hpa_resize(struct ata_device *dev) 
	return 0;

}



/**

 *	ata_noop_dev_select - Select device 0/1 on ATA bus

 *	@ap: ATA channel to manipulate

 *	@device: ATA device (numbered from zero) to select

 *

 *	This function performs no actual function.

 *

 *	May be used as the dev_select() entry in ata_port_operations.

 *

 *	LOCKING:

 *	caller.

 */

void ata_noop_dev_select(struct ata_port *ap, unsigned int device)

{

}



/**

 *	ata_dump_id - IDENTIFY DEVICE info debugging output

 *	@id: IDENTIFY DEVICE page to dump
@@ -6193,7 +6176,6 @@ static unsigned int ata_dummy_qc_issue(struct ata_queued_cmd *qc) 
struct ata_port_operations ata_dummy_port_ops = {

	.sff_check_status	= ata_dummy_check_status,

	.sff_check_altstatus	= ata_dummy_check_status,

	.sff_dev_select		= ata_noop_dev_select,

	.qc_prep		= ata_noop_qc_prep,

	.qc_issue		= ata_dummy_qc_issue,

	.freeze			= ata_dummy_noret,
@@ -6234,7 +6216,6 @@ EXPORT_SYMBOL_GPL(ata_host_detach); 
EXPORT_SYMBOL_GPL(ata_sg_init);

EXPORT_SYMBOL_GPL(ata_qc_complete);

EXPORT_SYMBOL_GPL(ata_qc_complete_multiple);

EXPORT_SYMBOL_GPL(ata_noop_dev_select);

EXPORT_SYMBOL_GPL(sata_print_link_status);

EXPORT_SYMBOL_GPL(atapi_cmd_type);

EXPORT_SYMBOL_GPL(ata_tf_to_fis);

drivers/scsi/ipr.c

+0 −1
Original line number Diff line number Diff line
@@ -5247,7 +5247,6 @@ static bool ipr_qc_fill_rtf(struct ata_queued_cmd *qc) 
}



static struct ata_port_operations ipr_sata_ops = {

	.sff_dev_select = ata_noop_dev_select,

	.phy_reset = ipr_ata_phy_reset,

	.hardreset = ipr_sata_reset,

	.post_internal_cmd = ipr_ata_post_internal,

drivers/scsi/libsas/sas_ata.c

+0 −1
Original line number Diff line number Diff line
@@ -344,7 +344,6 @@ static int sas_ata_scr_read(struct ata_port *ap, unsigned int sc_reg_in, 
}



static struct ata_port_operations sas_sata_ops = {

	.sff_dev_select		= ata_noop_dev_select,

	.phy_reset		= sas_ata_phy_reset,

	.post_internal_cmd	= sas_ata_post_internal,

	.qc_prep		= ata_noop_qc_prep,

include/linux/libata.h

+0 −1
Original line number Diff line number Diff line
@@ -911,7 +911,6 @@ extern unsigned long ata_xfer_mode2mask(u8 xfer_mode); 
extern int ata_xfer_mode2shift(unsigned long xfer_mode);

extern const char *ata_mode_string(unsigned long xfer_mask);

extern unsigned long ata_id_xfermask(const u16 *id);

extern void ata_noop_dev_select(struct ata_port *ap, unsigned int device);

extern int ata_port_start(struct ata_port *ap);

extern int ata_std_qc_defer(struct ata_queued_cmd *qc);

extern void ata_noop_qc_prep(struct ata_queued_cmd *qc);