From patchwork Tue Sep 12 07:47:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 13380954 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A1DECA0EC3 for ; Tue, 12 Sep 2023 07:47:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231774AbjILHr0 (ORCPT ); Tue, 12 Sep 2023 03:47:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231779AbjILHrY (ORCPT ); Tue, 12 Sep 2023 03:47:24 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45F8410C2 for ; Tue, 12 Sep 2023 00:47:20 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2846FC433C9; Tue, 12 Sep 2023 07:47:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694504839; bh=2JSdq+fjLhNBHeZKKH75zQHUgdFywdDaWh82cXZlNg0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=k0+pXaB2zbRB9iCrWAzFLlTpGs75E3UcXYwqWhbr6M4gtEXQhdZu0N0wZ3G29p3QO XBVOT6aF3U7g4V2WIXscQ3VbMjFqF3ciM5TQNqu+RGnrNJSddIBhicUauOJA4Q7U8s cVGgnd4TcgKDYCX1KoDCjyCvG7lcGF0whY2gvwCckfOUfuZfpAl8W1pOoFg1+vg8My 4kgwBBd9QYBUSmbzQbiO47+t2L7buf9qeqNNHsdiray1jtjmnkefggIkbyAnGmRnoD /9OYPfpx3Ob0Y+s9TVL2zaOkRyaaUq9bEVO2aIl0X5698iAkKntLAOHak0m5hYM5Q6 gt0KPxX9M0mkw== From: Damien Le Moal To: linux-scsi@vger.kernel.org, "Martin K . Petersen" , John Garry Subject: [PATCH 1/3] scsi: libsas: Move local functions declarations to sas_internal.h Date: Tue, 12 Sep 2023 16:47:13 +0900 Message-ID: <20230912074715.424062-2-dlemoal@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230912074715.424062-1-dlemoal@kernel.org> References: <20230912074715.424062-1-dlemoal@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Move the declarations of functions used only within libsas from include/scsi/libsas.h to drivers/scsi/libsas/sas_internal.h Signed-off-by: Damien Le Moal Reviewed-by: John Garry --- drivers/scsi/libsas/sas_internal.h | 11 +++++++++++ include/scsi/libsas.h | 12 ------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h index a6dc7dc07fce..e597c1620205 100644 --- a/drivers/scsi/libsas/sas_internal.h +++ b/drivers/scsi/libsas/sas_internal.h @@ -39,6 +39,17 @@ struct sas_phy_data { struct sas_work enable_work; }; +void sas_hash_addr(u8 *hashed, const u8 *sas_addr); + +int sas_discover_root_expander(struct domain_device *dev); + +int sas_ex_revalidate_domain(struct domain_device *dev); +void sas_unregister_domain_devices(struct asd_sas_port *port, int gone); +void sas_init_disc(struct sas_discovery *disc, struct asd_sas_port *port); +void sas_discover_event(struct asd_sas_port *, enum discover_event ev); + +void sas_unregister_dev(struct asd_sas_port *port, struct domain_device *dev); + void sas_scsi_recover_host(struct Scsi_Host *shost); int sas_register_phys(struct sas_ha_struct *sas_ha); diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 8a43534eea5c..87f194925b3c 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -404,8 +404,6 @@ cmd_to_domain_dev(struct scsi_cmnd *cmd) return sdev_to_domain_dev(cmd->device); } -void sas_hash_addr(u8 *hashed, const u8 *sas_addr); - /* Before calling a notify event, LLDD should use this function * when the link is severed (possibly from its tasklet). * The idea is that the Class only reads those, while the LLDD, @@ -699,18 +697,8 @@ extern struct scsi_transport_template * sas_domain_attach_transport(struct sas_domain_function_template *); extern struct device_attribute dev_attr_phy_event_threshold; -int sas_discover_root_expander(struct domain_device *); - -int sas_ex_revalidate_domain(struct domain_device *); - -void sas_unregister_domain_devices(struct asd_sas_port *port, int gone); -void sas_init_disc(struct sas_discovery *disc, struct asd_sas_port *); -void sas_discover_event(struct asd_sas_port *, enum discover_event ev); - int sas_discover_end_dev(struct domain_device *); -void sas_unregister_dev(struct asd_sas_port *port, struct domain_device *); - void sas_init_dev(struct domain_device *); void sas_task_abort(struct sas_task *); From patchwork Tue Sep 12 07:47:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 13380955 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1A6FCA0ECE for ; Tue, 12 Sep 2023 07:47:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231789AbjILHr1 (ORCPT ); Tue, 12 Sep 2023 03:47:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231765AbjILHrZ (ORCPT ); Tue, 12 Sep 2023 03:47:25 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77C4BE78 for ; Tue, 12 Sep 2023 00:47:21 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 52545C433C8; Tue, 12 Sep 2023 07:47:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694504841; bh=dDb2OR13rU8PBckEAenZVXz29tsHo+xkQPOI0ocl4Sk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=jLr473wNMX+SVsw+7I9V/qFe4hCh1AYAt3llr4uKBSlWdKxIWGZdBr8M2YMEdmcA7 DIyS8O0cEBHoRk8phPBjzc9k/zoSRL3qq77COEEtNyOM1LfdBdEcLK9AnUl/QlTKP1 YnGaAK7W5b0hsl1FJKjSaIjuv0QEkAe2drR1klY8DPjk+pQ7G3VDY9SCg36kacR/V7 ygQhIBVLdNhFxBfNb9A3TKcMVHfFeCnWxcOsr6cYY1GIxdeF5/uQwHNxHIrEitiZzU rBuwUk5lWI/nY9hzS78fcOa0Qrr/UQGIhpOwd+NFytslICVbAGpSSLrvFTPOfyxLiz fZBedJ2QBZ8Jg== From: Damien Le Moal To: linux-scsi@vger.kernel.org, "Martin K . Petersen" , John Garry Subject: [PATCH 2/3] scsi: libsas: Declare sas_set_phy_speed() static Date: Tue, 12 Sep 2023 16:47:14 +0900 Message-ID: <20230912074715.424062-3-dlemoal@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230912074715.424062-1-dlemoal@kernel.org> References: <20230912074715.424062-1-dlemoal@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org sas_set_phy_speed() is used only within sas_init.c. Declare this function as static. Signed-off-by: Damien Le Moal Reviewed-by: John Garry --- drivers/scsi/libsas/sas_init.c | 4 ++-- include/scsi/libsas.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c index 8586dc79f2a0..9c8cc723170d 100644 --- a/drivers/scsi/libsas/sas_init.c +++ b/drivers/scsi/libsas/sas_init.c @@ -315,8 +315,8 @@ int sas_phy_reset(struct sas_phy *phy, int hard_reset) } EXPORT_SYMBOL_GPL(sas_phy_reset); -int sas_set_phy_speed(struct sas_phy *phy, - struct sas_phy_linkrates *rates) +static int sas_set_phy_speed(struct sas_phy *phy, + struct sas_phy_linkrates *rates) { int ret; diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 87f194925b3c..5ee86b225359 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -679,7 +679,6 @@ extern void sas_resume_ha(struct sas_ha_struct *sas_ha); extern void sas_resume_ha_no_sync(struct sas_ha_struct *sas_ha); extern void sas_suspend_ha(struct sas_ha_struct *sas_ha); -int sas_set_phy_speed(struct sas_phy *phy, struct sas_phy_linkrates *rates); int sas_phy_reset(struct sas_phy *phy, int hard_reset); int sas_phy_enable(struct sas_phy *phy, int enable); extern int sas_queuecommand(struct Scsi_Host *, struct scsi_cmnd *); From patchwork Tue Sep 12 07:47:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 13380956 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14C0DCA0ECF for ; Tue, 12 Sep 2023 07:47:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231797AbjILHr3 (ORCPT ); Tue, 12 Sep 2023 03:47:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231781AbjILHr0 (ORCPT ); Tue, 12 Sep 2023 03:47:26 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C8F8E79 for ; Tue, 12 Sep 2023 00:47:22 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74437C433C7; Tue, 12 Sep 2023 07:47:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694504842; bh=7K3Te840Hth/WiXD63jli4PIbfxwQNxsR4MNc1WnHmo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=T6hODUsMqEtkeFD4l9vJaARLpeY7QFGG0O6Fuu7/bahNTlCVyOjOLmjfTqHSg5EVs aQ3+c6wz5D3+2+q3+U0lL7OnlGAZhwJde0Ff+9zjo7uU2YlfSN0L+xOpNdsmDjAqTd KwNzlkoW7xNR+lH985qKqy1KeKPgErpEGxMJDlK6YYRZDSvp/adFOj3Tc5pAJy+ccq PLH7z11zOrLki2utcjCV47L1cBQjPpc9LgqHfYyR3zIaRN+exc+8H9U0fiNi/EjyS6 tH9QzsmHQi1kqMwLamLPkHTrD1pLklclwU+zwJwltOeAszZ7dYR7rzoFI8Ge+bgUzt SKxjH81fyMyeg== From: Damien Le Moal To: linux-scsi@vger.kernel.org, "Martin K . Petersen" , John Garry Subject: [PATCH 3/3] scsi: libsas: Declare sas_discover_end_dev() static Date: Tue, 12 Sep 2023 16:47:15 +0900 Message-ID: <20230912074715.424062-4-dlemoal@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230912074715.424062-1-dlemoal@kernel.org> References: <20230912074715.424062-1-dlemoal@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org sas_discover_end_dev() is defined and used used only in sas_discover.c. Define this function as static. Signed-off-by: Damien Le Moal Reviewed-by: John Garry --- drivers/scsi/libsas/sas_discover.c | 2 +- include/scsi/libsas.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c index ff7b63b10aeb..8fb7c41c0962 100644 --- a/drivers/scsi/libsas/sas_discover.c +++ b/drivers/scsi/libsas/sas_discover.c @@ -275,7 +275,7 @@ static void sas_resume_devices(struct work_struct *work) * * See comment in sas_discover_sata(). */ -int sas_discover_end_dev(struct domain_device *dev) +static int sas_discover_end_dev(struct domain_device *dev) { return sas_notify_lldd_dev_found(dev); } diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 5ee86b225359..4ce4809aec42 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h @@ -696,8 +696,6 @@ extern struct scsi_transport_template * sas_domain_attach_transport(struct sas_domain_function_template *); extern struct device_attribute dev_attr_phy_event_threshold; -int sas_discover_end_dev(struct domain_device *); - void sas_init_dev(struct domain_device *); void sas_task_abort(struct sas_task *);