From: Hannes Reinecke <hare@suse.de>
To: Damien LeMoal <dlemoal@kernel.org>
Cc: linux-ide@vger.kernel.org, Hannes Reinecke <hare@suse.de>
Subject: [PATCH 3/6] ata,scsi: remove ata_sas_port_destroy()
Date: Thu, 11 May 2023 00:52:08 +0200 [thread overview]
Message-ID: <20230510225211.111113-4-hare@suse.de> (raw)
In-Reply-To: <20230510225211.111113-1-hare@suse.de>
Is now a wrapper around kfree(), so call it directly.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/ata/libata-sata.c | 18 ------------------
drivers/scsi/libsas/sas_ata.c | 2 +-
drivers/scsi/libsas/sas_discover.c | 2 +-
include/linux/libata.h | 1 -
4 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/drivers/ata/libata-sata.c b/drivers/ata/libata-sata.c
index 3c56b15c43f1..70da34a35c54 100644
--- a/drivers/ata/libata-sata.c
+++ b/drivers/ata/libata-sata.c
@@ -1156,10 +1156,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;
}
@@ -1177,20 +1173,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
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 7ead1f1be97f..a2eb9a2191c0 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -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;
diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index 8c6afe724944..07e18cdb85c7 100644
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -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;
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 395b25fea187..dbd3df0fb69d 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1222,7 +1222,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);
--
2.35.3
next prev parent reply other threads:[~2023-05-10 22:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-10 22:52 [PATCH 0/6] libata: remove references to 'old' error handler Hannes Reinecke
2023-05-10 22:52 ` [PATCH 1/6] ata: remove reference to non-existing error_handler() Hannes Reinecke
2023-05-15 7:01 ` Damien Le Moal
2023-05-15 10:09 ` Niklas Cassel
2023-05-23 2:25 ` kernel test robot
2023-05-10 22:52 ` [PATCH 2/6] ata,scsi: remove ata_sas_port_{start,stop} callbacks Hannes Reinecke
2023-05-10 22:52 ` Hannes Reinecke [this message]
2023-05-10 22:52 ` [PATCH 4/6] ata: remove ata_sas_sync_probe() Hannes Reinecke
2023-05-10 22:52 ` [PATCH 5/6] ata: inline ata_port_probe() Hannes Reinecke
2023-05-10 22:52 ` [PATCH 6/6] ata,scsi: cleanup ata_port_probe() Hannes Reinecke
2023-05-22 0:46 ` [PATCH 0/6] libata: remove references to 'old' error handler Damien Le Moal
2023-05-22 6:46 ` Hannes Reinecke
2023-06-05 14:43 ` Niklas Cassel
2023-06-05 15:09 ` Niklas Cassel
2023-06-05 15:12 ` Hannes Reinecke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230510225211.111113-4-hare@suse.de \
--to=hare@suse.de \
--cc=dlemoal@kernel.org \
--cc=linux-ide@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.