From patchwork Fri Nov 18 08:37:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Zhan X-Patchwork-Id: 22193 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp69862wrr; Fri, 18 Nov 2022 00:45:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf4/CJiTZMuq0YsS6tIr5QJkr0fCM6hqnGbFoX2mwKXU+CyiduuOQsHJ9JEFKLBVxEwVQB8Z X-Received: by 2002:a17:902:9304:b0:188:d588:34f2 with SMTP id bc4-20020a170902930400b00188d58834f2mr6763010plb.15.1668761151944; Fri, 18 Nov 2022 00:45:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668761151; cv=none; d=google.com; s=arc-20160816; b=at+NfPoFueA928COXYxbO3AEqUTKL9WHMMbq2DwmFnnLqNgPwpkUrFg33l8Bl+EGyl tXfIXu846qJt3m+WVjsVjmB5NwoaCkpE7Ga+xASXattPc1Ee0Z5la75GdS5LNVKGJIH8 niVfKKeIwZifvp2VRoCisC+LwfifoizWS/xZ0WnEMSwyUGKICOCCURUC0v4sIRnCvFb4 xfppVvi3i+c0kjoRkjTV/5SV2AVSmuwao6q6LKsCQI74y34KTdZKMTdluN7yY9E/OS70 59UpFYYvj1Msp7nBKTMj7OSvivvwUVfUq+FFsQA1TVP5uvhe43nD5a2RaGc54v9kSTuW mAPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Q286+t93h5wEv/hbc/o1h+HdzI+R+tY7q+NQjQ65fUI=; b=M2XrN2L05vwzDE8FUd/uTtS4Pi+D5ZSnHH8jkGH9u9tTAOE0rTCi2Ool8IsNv+qlCE tdBr5yXyjaKbLyHSM7P+EQVwdYjMcm6Ln45iIpfKLkLoFMfhDsD0TI7fnFyXoRB7V9JT 43vHcIVDnIH1RMBxZrYsyDZQ7/7DikvgwrKxKpvAOfKcwCwJ8Iaw/+cFy4NtIHc7AJFr r99Y5Ru73bn+tZGFwQ34fG4k+7vNtwW68jHxM2ji/PX1aOZRCsQ98i4/56NjC5JMMb2A HK3hT062mzcDz89V2+PgSDNTvb/Fc83jPlTlqla1CetTPIZ63/RDNuthLI6nqy3HQQTm TjhA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q5-20020a170902dac500b0018863dbf3b1si3958026plx.284.2022.11.18.00.45.39; Fri, 18 Nov 2022 00:45:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241115AbiKRIiw (ORCPT + 99 others); Fri, 18 Nov 2022 03:38:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241311AbiKRIib (ORCPT ); Fri, 18 Nov 2022 03:38:31 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 955FAE0F7; Fri, 18 Nov 2022 00:38:29 -0800 (PST) Received: from dggpeml500021.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4ND97b0wlXzqSYm; Fri, 18 Nov 2022 16:34:35 +0800 (CST) Received: from dggpeml500019.china.huawei.com (7.185.36.137) by dggpeml500021.china.huawei.com (7.185.36.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 18 Nov 2022 16:38:19 +0800 Received: from localhost.localdomain (10.67.165.2) by dggpeml500019.china.huawei.com (7.185.36.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Fri, 18 Nov 2022 16:38:18 +0800 From: Jie Zhan To: , CC: , , , , , , , , , , , , Subject: [PATCH for-next 5/5] scsi: libsas: Do not export sas_ata_wait_after_reset() Date: Fri, 18 Nov 2022 16:37:14 +0800 Message-ID: <20221118083714.4034612-6-zhanjie9@hisilicon.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20221118083714.4034612-1-zhanjie9@hisilicon.com> References: <20221118083714.4034612-1-zhanjie9@hisilicon.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.2] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpeml500019.china.huawei.com (7.185.36.137) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749822893337641078?= X-GMAIL-MSGID: =?utf-8?q?1749822893337641078?= sas_ata_wait_after_reset() does not need to be exported since it is no longer referenced outside libsas. Signed-off-by: Jie Zhan Reviewed-by: John Garry --- 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;