Commit 43aa4335 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Damien Le Moal
Browse files

ata,scsi: remove ata_sas_port_{start,stop} callbacks 



Callbacks are empty now, so remove them.

Also, remove the call to ap->ops->port_start() in ata_sas_port_init(),
as this would otherwise cause a NULL pointer dereference, now when the
callback is gone.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
[niklas: remove the call to ap->ops->port_start() in ata_sas_port_init()]
Signed-off-by: default avatarNiklas Cassel <niklas.cassel@wdc.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
parent ff8072d5

drivers/ata/libata-sata.c

+0 −38
Original line number Diff line number Diff line
@@ -1144,40 +1144,6 @@ struct ata_port *ata_sas_port_alloc(struct ata_host *host, 
}

EXPORT_SYMBOL_GPL(ata_sas_port_alloc);



/**

 *	ata_sas_port_start - Set port up for dma.

 *	@ap: Port to initialize

 *

 *	Called just after data structures for each port are

 *	initialized.

 *

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

 *

 *	LOCKING:

 *	Inherited from caller.

 */

int ata_sas_port_start(struct ata_port *ap)

{

	/* the port is marked as frozen at allocation time */

	return 0;

}

EXPORT_SYMBOL_GPL(ata_sas_port_start);



/**

 *	ata_sas_port_stop - Undo ata_sas_port_start()

 *	@ap: Port to shut down

 *

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

 *

 *	LOCKING:

 *	Inherited from caller.

 */



void ata_sas_port_stop(struct ata_port *ap)

{

}

EXPORT_SYMBOL_GPL(ata_sas_port_stop);



/**

 * ata_sas_async_probe - simply schedule probing and return

 * @ap: Port to probe
@@ -1211,10 +1177,6 @@ EXPORT_SYMBOL_GPL(ata_sas_sync_probe); 


int ata_sas_port_init(struct ata_port *ap)

{

	int rc = ap->ops->port_start(ap);



	if (rc)

		return rc;

	ap->print_id = atomic_inc_return(&ata_print_id);

	return 0;

}

drivers/scsi/libsas/sas_ata.c

+0 −2
Original line number Diff line number Diff line
@@ -565,8 +565,6 @@ static struct ata_port_operations sas_sata_ops = { 
	.qc_prep		= ata_noop_qc_prep,

	.qc_issue		= sas_ata_qc_issue,

	.qc_fill_rtf		= sas_ata_qc_fill_rtf,

	.port_start		= ata_sas_port_start,

	.port_stop		= ata_sas_port_stop,

	.set_dmamode		= sas_ata_set_dmamode,

	.sched_eh		= sas_ata_sched_eh,

	.end_eh			= sas_ata_end_eh,

include/linux/libata.h

+0 −2
Original line number Diff line number Diff line
@@ -1244,10 +1244,8 @@ extern struct ata_port *ata_sas_port_alloc(struct ata_host *, 
extern void ata_sas_async_probe(struct ata_port *ap);

extern int ata_sas_sync_probe(struct ata_port *ap);

extern int ata_sas_port_init(struct ata_port *);

extern int ata_sas_port_start(struct ata_port *ap);

extern int ata_sas_tport_add(struct device *parent, struct ata_port *ap);

extern void ata_sas_tport_delete(struct ata_port *ap);

extern void ata_sas_port_stop(struct ata_port *ap);

extern int ata_sas_slave_configure(struct scsi_device *, struct ata_port *);

extern int ata_sas_queuecmd(struct scsi_cmnd *cmd, struct ata_port *ap);

extern void ata_tf_to_fis(const struct ata_taskfile *tf,