Commit 6c2fe21e authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Damien Le Moal
Browse files

ata,scsi: remove ata_sas_port_destroy() 



Is now a wrapper around kfree(), so call it directly.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarNiklas Cassel <niklas.cassel@wdc.com>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarJason Yan <yanaijie@huawei.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
parent 43aa4335

drivers/ata/libata-sata.c

+0 −14
Original line number Diff line number Diff line
@@ -1194,20 +1194,6 @@ void ata_sas_tport_delete(struct ata_port *ap) 
}

EXPORT_SYMBOL_GPL(ata_sas_tport_delete);



/**

 *	ata_sas_port_destroy - Destroy a SATA port allocated by ata_sas_port_alloc

 *	@ap: SATA port to destroy

 *

 */



void ata_sas_port_destroy(struct ata_port *ap)

{

	if (ap->ops->port_stop)

		ap->ops->port_stop(ap);

	kfree(ap);

}

EXPORT_SYMBOL_GPL(ata_sas_port_destroy);



/**

 *	ata_sas_slave_configure - Default slave_config routine for libata devices

 *	@sdev: SCSI device to configure

drivers/scsi/libsas/sas_ata.c

+1 −1
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ int sas_ata_init(struct domain_device *found_dev) 
	return 0;



destroy_port:

	ata_sas_port_destroy(ap);

	kfree(ap);

free_host:

	ata_host_put(ata_host);

	return rc;

drivers/scsi/libsas/sas_discover.c

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ void sas_free_device(struct kref *kref) 


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

		ata_sas_tport_delete(dev->sata_dev.ap);

		ata_sas_port_destroy(dev->sata_dev.ap);

		kfree(dev->sata_dev.ap);

		ata_host_put(dev->sata_dev.ata_host);

		dev->sata_dev.ata_host = NULL;

		dev->sata_dev.ap = NULL;

include/linux/libata.h

+0 −1
Original line number Diff line number Diff line
@@ -1238,7 +1238,6 @@ extern int sata_link_debounce(struct ata_link *link, 
extern int sata_link_scr_lpm(struct ata_link *link, enum ata_lpm_policy policy,

			     bool spm_wakeup);

extern int ata_slave_link_init(struct ata_port *ap);

extern void ata_sas_port_destroy(struct ata_port *);

extern struct ata_port *ata_sas_port_alloc(struct ata_host *,

					   struct ata_port_info *, struct Scsi_Host *);

extern void ata_sas_async_probe(struct ata_port *ap);