Commit 28bc42bf authored by Jie Zhan's avatar Jie Zhan Committed by ZhouJuan
Browse files

scsi: libsas: Do not export sas_ata_wait_after_reset() 

mainline inclusion
from mainline-v6.2-rc1
commit 4d450cf2
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6V6I1
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4d450cf2b00d



----------------------------------------------------------------------

sas_ata_wait_after_reset() does not need to be exported since it is no
longer referenced outside libsas.

Signed-off-by: default avatarJie Zhan <zhanjie9@hisilicon.com>
Link: https://lore.kernel.org/r/20221118083714.4034612-6-zhanjie9@hisilicon.com


Reviewed-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarxiabing <xiabing12@h-partners.com>
parent 1e2a46b6

drivers/scsi/libsas/sas_ata.c

+1 −2
Original line number Diff line number Diff line
@@ -397,7 +397,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);
@@ -419,7 +419,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)

include/scsi/sas_ata.h

+0 −7
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ void sas_suspend_sata(struct asd_sas_port *port); 
void sas_resume_sata(struct asd_sas_port *port);

void sas_ata_end_eh(struct ata_port *ap);

void sas_ata_device_link_abort(struct domain_device *dev, bool force_reset);

int sas_ata_wait_after_reset(struct domain_device *dev, unsigned long deadline);

int smp_ata_check_ready_type(struct ata_link *link);

#else
@@ -94,12 +93,6 @@ static inline void sas_ata_device_link_abort(struct domain_device *dev, 
{

}



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;