Skip to content

Commit 6c2fe21

Browse files
hreineckedamien-lemoal
authored andcommitted
ata,scsi: remove ata_sas_port_destroy()
Is now a wrapper around kfree(), so call it directly. Signed-off-by: Hannes Reinecke <hare@suse.de> Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com> Reviewed-by: John Garry <john.g.garry@oracle.com> Reviewed-by: Jason Yan <yanaijie@huawei.com> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
1 parent 43aa433 commit 6c2fe21

4 files changed

Lines changed: 2 additions & 17 deletions

File tree

drivers/ata/libata-sata.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,20 +1194,6 @@ void ata_sas_tport_delete(struct ata_port *ap)
11941194
}
11951195
EXPORT_SYMBOL_GPL(ata_sas_tport_delete);
11961196

1197-
/**
1198-
* ata_sas_port_destroy - Destroy a SATA port allocated by ata_sas_port_alloc
1199-
* @ap: SATA port to destroy
1200-
*
1201-
*/
1202-
1203-
void ata_sas_port_destroy(struct ata_port *ap)
1204-
{
1205-
if (ap->ops->port_stop)
1206-
ap->ops->port_stop(ap);
1207-
kfree(ap);
1208-
}
1209-
EXPORT_SYMBOL_GPL(ata_sas_port_destroy);
1210-
12111197
/**
12121198
* ata_sas_slave_configure - Default slave_config routine for libata devices
12131199
* @sdev: SCSI device to configure

drivers/scsi/libsas/sas_ata.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ int sas_ata_init(struct domain_device *found_dev)
619619
return 0;
620620

621621
destroy_port:
622-
ata_sas_port_destroy(ap);
622+
kfree(ap);
623623
free_host:
624624
ata_host_put(ata_host);
625625
return rc;

drivers/scsi/libsas/sas_discover.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ void sas_free_device(struct kref *kref)
301301

302302
if (dev_is_sata(dev) && dev->sata_dev.ap) {
303303
ata_sas_tport_delete(dev->sata_dev.ap);
304-
ata_sas_port_destroy(dev->sata_dev.ap);
304+
kfree(dev->sata_dev.ap);
305305
ata_host_put(dev->sata_dev.ata_host);
306306
dev->sata_dev.ata_host = NULL;
307307
dev->sata_dev.ap = NULL;

include/linux/libata.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1238,7 +1238,6 @@ extern int sata_link_debounce(struct ata_link *link,
12381238
extern int sata_link_scr_lpm(struct ata_link *link, enum ata_lpm_policy policy,
12391239
bool spm_wakeup);
12401240
extern int ata_slave_link_init(struct ata_port *ap);
1241-
extern void ata_sas_port_destroy(struct ata_port *);
12421241
extern struct ata_port *ata_sas_port_alloc(struct ata_host *,
12431242
struct ata_port_info *, struct Scsi_Host *);
12441243
extern void ata_sas_async_probe(struct ata_port *ap);

0 commit comments

Comments
 (0)