Commit c10bc561 authored by Niklas Cassel's avatar Niklas Cassel
Browse files

ata,scsi: Remove wrappers ata_sas_tport_{add,delete}() 



The ata_sas_tport_add() and ata_sas_tport_delete() wrappers only exist in
order to export the internal libata functions which they wrap.
Remove the wrappers and instead export the libata functions directly.

Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20240703184418.723066-12-cassel@kernel.org


Signed-off-by: default avatarNiklas Cassel <cassel@kernel.org>
parent 831d83a5

drivers/ata/libata-sata.c

+0 −12
Original line number Diff line number Diff line
@@ -1241,18 +1241,6 @@ struct ata_port *ata_sas_port_alloc(struct ata_host *host, 
}

EXPORT_SYMBOL_GPL(ata_sas_port_alloc);



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

{

	return ata_tport_add(parent, ap);

}

EXPORT_SYMBOL_GPL(ata_sas_tport_add);



void ata_sas_tport_delete(struct ata_port *ap)

{

	ata_tport_delete(ap);

}

EXPORT_SYMBOL_GPL(ata_sas_tport_delete);



/**

 *	ata_sas_device_configure - Default device_configure routine for libata

 *				   devices

drivers/ata/libata-transport.c

+2 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ void ata_tport_delete(struct ata_port *ap) 
	transport_destroy_device(dev);

	put_device(dev);

}

EXPORT_SYMBOL_GPL(ata_tport_delete);



static const struct device_type ata_port_sas_type = {

	.name = ATA_PORT_TYPE_NAME,
@@ -329,6 +330,7 @@ int ata_tport_add(struct device *parent, 
	put_device(dev);

	return error;

}

EXPORT_SYMBOL_GPL(ata_tport_add);



/**

 *     ata_port_classify - determine device type based on ATA-spec signature

drivers/ata/libata-transport.h

+0 −3
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ extern struct scsi_transport_template *ata_scsi_transport_template; 
int ata_tlink_add(struct ata_link *link);

void ata_tlink_delete(struct ata_link *link);



int ata_tport_add(struct device *parent, struct ata_port *ap);

void ata_tport_delete(struct ata_port *ap);



struct scsi_transport_template *ata_attach_transport(void);

void ata_release_transport(struct scsi_transport_template *t);

drivers/scsi/libsas/sas_ata.c

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ int sas_ata_init(struct domain_device *found_dev) 
	ap->cbl = ATA_CBL_SATA;

	ap->scsi_host = shost;



	rc = ata_sas_tport_add(ata_host->dev, ap);

	rc = ata_tport_add(ata_host->dev, ap);

	if (rc)

		goto free_port;

drivers/scsi/libsas/sas_discover.c

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ void sas_free_device(struct kref *kref) 
		kfree(dev->ex_dev.ex_phy);



	if (dev_is_sata(dev) && dev->sata_dev.ap) {

		ata_sas_tport_delete(dev->sata_dev.ap);

		ata_tport_delete(dev->sata_dev.ap);

		ata_port_free(dev->sata_dev.ap);

		ata_host_put(dev->sata_dev.ata_host);

		dev->sata_dev.ata_host = NULL;