[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20221118083714.4034612-6-zhanjie9@hisilicon.com>
Date: Fri, 18 Nov 2022 16:37:14 +0800
From: Jie Zhan <zhanjie9@...ilicon.com>
To: <jejb@...ux.ibm.com>, <martin.petersen@...cle.com>
CC: <chenxiang66@...ilicon.com>, <john.g.garry@...cle.com>,
<damien.lemoal@...nsource.wdc.com>, <yanaijie@...wei.com>,
<johannes.thumshirn@....com>, <duoming@....edu.cn>,
<zhanjie9@...ilicon.com>, <liyihang9@...wei.com>,
<yangxingui@...wei.com>, <prime.zeng@...ilicon.com>,
<linuxarm@...wei.com>, <linux-scsi@...r.kernel.org>,
<linux-kernel@...r.kernel.org>
Subject: [PATCH for-next 5/5] scsi: libsas: Do not export sas_ata_wait_after_reset()
sas_ata_wait_after_reset() does not need to be exported since it is
no longer referenced outside libsas.
Signed-off-by: Jie Zhan <zhanjie9@...ilicon.com>
Reviewed-by: John Garry <john.garry@...wei.com>
---
drivers/scsi/libsas/sas_ata.c | 3 +--
include/scsi/sas_ata.h | 7 -------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 4b65cd79150f..f7439bf9cdc6 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -383,7 +383,7 @@ static int sas_ata_printk(const char *level, const struct domain_device *ddev,
return r;
}
-int sas_ata_wait_after_reset(struct domain_device *dev, unsigned long deadline)
+static int sas_ata_wait_after_reset(struct domain_device *dev, unsigned long deadline)
{
struct sata_device *sata_dev = &dev->sata_dev;
int (*check_ready)(struct ata_link *link);
@@ -405,7 +405,6 @@ int sas_ata_wait_after_reset(struct domain_device *dev, unsigned long deadline)
return ret;
}
-EXPORT_SYMBOL_GPL(sas_ata_wait_after_reset);
static int sas_ata_hard_reset(struct ata_link *link, unsigned int *class,
unsigned long deadline)
diff --git a/include/scsi/sas_ata.h b/include/scsi/sas_ata.h
index e7d466df8157..9c927d46f136 100644
--- a/include/scsi/sas_ata.h
+++ b/include/scsi/sas_ata.h
@@ -35,7 +35,6 @@ void sas_ata_end_eh(struct ata_port *ap);
void sas_ata_device_link_abort(struct domain_device *dev, bool force_reset);
int sas_execute_ata_cmd(struct domain_device *device, u8 *fis,
int force_phy_id);
-int sas_ata_wait_after_reset(struct domain_device *dev, unsigned long deadline);
int smp_ata_check_ready_type(struct ata_link *link);
#else
@@ -100,12 +99,6 @@ static inline int sas_execute_ata_cmd(struct domain_device *device, u8 *fis,
return 0;
}
-static inline int sas_ata_wait_after_reset(struct domain_device *dev,
- unsigned long deadline)
-{
- return -ETIMEDOUT;
-}
-
static inline int smp_ata_check_ready_type(struct ata_link *link)
{
return 0;
--
2.30.0
Powered by blists - more mailing lists