From patchwork Tue Sep 12 23:05:49 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: 13382290 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 97F93EE49A4 for ; Tue, 12 Sep 2023 23:05:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237864AbjILXF7 (ORCPT ); Tue, 12 Sep 2023 19:05:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233926AbjILXF7 (ORCPT ); Tue, 12 Sep 2023 19:05:59 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 762CD10CC for ; Tue, 12 Sep 2023 16:05:55 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74B8BC433C9; Tue, 12 Sep 2023 23:05:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694559955; bh=/++H2vOxecYZw1i9MdzAT9+O8EKVSE1ONbyr1tKy7zI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=gO0+ZsRt8yxqhJypUL16uzeurzdPMGoLjWCRIcXTWJH7MgIjobIDyKHa3gxyjPNw+ 5vLOEBonIL8MoLB2MHyhh7DgUYrpY14mtD+idcsTAGrqo2LOO34bqeguy0Io7aL9s5 VaKo9vcAfWVVd+H6oSS+L4MAcu37ro/SUx4hCoOsqcMaE9A54UdxlFQO4ifpwl2ydb n9uyeKjEyJB4Y5QLmUZ9FtI01HKrrcFVmoLZP/g9H0Mx9ipNuNa3nvp13+fe4onDtt toeGAnZXxh1gQCR0okrpTiH1+4QkkjWh4diuRQwSxhULwXgFSLMHTXTXnA7jCeB+oz K9lNoRGt31oCw== From: Damien Le Moal To: linux-scsi@vger.kernel.org, "Martin K . Petersen" , John Garry Subject: [PATCH v3 1/3] scsi: libsas: Move local functions declarations to sas_internal.h Date: Wed, 13 Sep 2023 08:05:49 +0900 Message-ID: <20230912230551.454357-2-dlemoal@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230912230551.454357-1-dlemoal@kernel.org> References: <20230912230551.454357-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 Reviewed-by: Johannes Thumshirn --- drivers/scsi/libsas/sas_internal.h | 12 ++++++++++++ include/scsi/libsas.h | 14 -------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h index a6dc7dc07fce..3804aef165ad 100644 --- a/drivers/scsi/libsas/sas_internal.h +++ b/drivers/scsi/libsas/sas_internal.h @@ -39,6 +39,18 @@ 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 *port, enum discover_event ev); + +void sas_init_dev(struct domain_device *dev); +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..2e800690b127 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,20 +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 *); int sas_eh_abort_handler(struct scsi_cmnd *cmd); int sas_eh_device_reset_handler(struct scsi_cmnd *cmd); From patchwork Tue Sep 12 23:05:50 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: 13382291 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 61259EE49B7 for ; Tue, 12 Sep 2023 23:05:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237871AbjILXGB (ORCPT ); Tue, 12 Sep 2023 19:06:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233926AbjILXGA (ORCPT ); Tue, 12 Sep 2023 19:06:00 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7759D10CC for ; Tue, 12 Sep 2023 16:05:56 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 79427C433C7; Tue, 12 Sep 2023 23:05:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694559956; bh=48eF2cgpkycKIzkMa5k5kr5XhEsGILdgX/pUN0n575w=; h=From:To:Subject:Date:In-Reply-To:References:From; b=lLbA1eMXvo4TGXh7J3yCrZfTHxEX20vBaPcMvOHVTg2t6a8ttEQi44i8puj66rMhm zHpVV5dxESFDmHiJa/NM/ZuMjcaCbknSsYQIjNf8OqAvdT9dHu6VNJQQem0lrZN8I+ k9onM2hPTOT3EXkF2U5vgPXlYumz96a4B+tDpPUHltJGxx30zSZ7efbjQI2yfEGF8B yTsw9zc4F/ZZLQdlRSDQhSMBi+JRWahisLM9rnB8XylnjYmODOnALskV1GUA7+s892 PYoEpnbOgktDpv+Q0tMfzkxqt/QvQE9M+JVFWwf8Tw7TgwgF1VDF/tKbEV0qqgcceF nT8B2LGZwwccQ== From: Damien Le Moal To: linux-scsi@vger.kernel.org, "Martin K . Petersen" , John Garry Subject: [PATCH v3 2/3] scsi: libsas: Declare sas_set_phy_speed() static Date: Wed, 13 Sep 2023 08:05:50 +0900 Message-ID: <20230912230551.454357-3-dlemoal@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230912230551.454357-1-dlemoal@kernel.org> References: <20230912230551.454357-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 Reviewed-by: Johannes Thumshirn --- 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 2e800690b127..d3ace28ee41f 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 23:05:51 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: 13382292 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 5869EEE3F39 for ; Tue, 12 Sep 2023 23:05:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237875AbjILXGC (ORCPT ); Tue, 12 Sep 2023 19:06:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237872AbjILXGB (ORCPT ); Tue, 12 Sep 2023 19:06:01 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74E0A10F4 for ; Tue, 12 Sep 2023 16:05:57 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A084C433CA; Tue, 12 Sep 2023 23:05:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694559957; bh=sm0gdVc1b17ynjL3gVmhqzM/RnQM3ORha2ZB0uH80Hs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Jez6CdA0L/ibIUYiSCi7nxZjP/Dsx/HOPh56LZGIOp5/POEmiDc7Q0WXuSwDtq3PM xJHJdepG+u+4HkMzfguxwimMUbk+KhIiVSZrRt7Om7oKm1ljikDepohVVPEN6cx5VJ 6l4AehvacpVhleeo5eT/eF9CQG0+IJa9/acSnSXSODcre95+a6bGujQ6Z2nZhMp2Lq Iq/29WsWUjg/SU1HpcxusSis/YxG5MU/NOvmi5rd+38t5Qx00ka4xkeLLxG+BQs7OK BEJn4b3wYbxrC3NZFeMEUBye5kZlVTawkx39EI+wJI3qmlnFXjxr5YQ34WJ2R+Sk30 nGsjiGL8gzePw== From: Damien Le Moal To: linux-scsi@vger.kernel.org, "Martin K . Petersen" , John Garry Subject: [PATCH v3 3/3] scsi: libsas: Declare sas_discover_end_dev() static Date: Wed, 13 Sep 2023 08:05:51 +0900 Message-ID: <20230912230551.454357-4-dlemoal@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230912230551.454357-1-dlemoal@kernel.org> References: <20230912230551.454357-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 only in sas_discover.c. Define this function as static. Signed-off-by: Damien Le Moal Reviewed-by: John Garry Reviewed-by: Johannes Thumshirn --- 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 d3ace28ee41f..f5257103fdb6 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_task_abort(struct sas_task *); int sas_eh_abort_handler(struct scsi_cmnd *cmd); int sas_eh_device_reset_handler(struct scsi_cmnd *cmd);