* [PATCH v3 0/3] Minor cleanups
@ 2023-09-12 23:05 Damien Le Moal
2023-09-12 23:05 ` [PATCH v3 1/3] scsi: libsas: Move local functions declarations to sas_internal.h Damien Le Moal
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Damien Le Moal @ 2023-09-12 23:05 UTC (permalink / raw)
To: linux-scsi, Martin K . Petersen, John Garry
3 patches to cleanup libsas functions declarations. No functional
changes.
Changes from v2:
* Added argument name to sas_discover_event() in patch 1
* Removed repeated word "used" from commit message of patch 3
* Added Johannes' review tag
Changes from v1:
* Added sas_init_dev() declaration change to patch 1
* Added John's review tag
Damien Le Moal (3):
scsi: libsas: Move local functions declarations to sas_internal.h
scsi: libsas: Declare sas_set_phy_speed() static
scsi: libsas: Declare sas_discover_end_dev() static
drivers/scsi/libsas/sas_discover.c | 2 +-
drivers/scsi/libsas/sas_init.c | 4 ++--
drivers/scsi/libsas/sas_internal.h | 12 ++++++++++++
include/scsi/libsas.h | 17 -----------------
4 files changed, 15 insertions(+), 20 deletions(-)
--
2.41.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 1/3] scsi: libsas: Move local functions declarations to sas_internal.h
2023-09-12 23:05 [PATCH v3 0/3] Minor cleanups Damien Le Moal
@ 2023-09-12 23:05 ` Damien Le Moal
2023-09-12 23:05 ` [PATCH v3 2/3] scsi: libsas: Declare sas_set_phy_speed() static Damien Le Moal
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Damien Le Moal @ 2023-09-12 23:05 UTC (permalink / raw)
To: linux-scsi, Martin K . Petersen, John Garry
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 <dlemoal@kernel.org>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
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);
--
2.41.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 2/3] scsi: libsas: Declare sas_set_phy_speed() static
2023-09-12 23:05 [PATCH v3 0/3] Minor cleanups Damien Le Moal
2023-09-12 23:05 ` [PATCH v3 1/3] scsi: libsas: Move local functions declarations to sas_internal.h Damien Le Moal
@ 2023-09-12 23:05 ` Damien Le Moal
2023-09-12 23:05 ` [PATCH v3 3/3] scsi: libsas: Declare sas_discover_end_dev() static Damien Le Moal
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Damien Le Moal @ 2023-09-12 23:05 UTC (permalink / raw)
To: linux-scsi, Martin K . Petersen, John Garry
sas_set_phy_speed() is used only within sas_init.c. Declare this
function as static.
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
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 *);
--
2.41.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 3/3] scsi: libsas: Declare sas_discover_end_dev() static
2023-09-12 23:05 [PATCH v3 0/3] Minor cleanups Damien Le Moal
2023-09-12 23:05 ` [PATCH v3 1/3] scsi: libsas: Move local functions declarations to sas_internal.h Damien Le Moal
2023-09-12 23:05 ` [PATCH v3 2/3] scsi: libsas: Declare sas_set_phy_speed() static Damien Le Moal
@ 2023-09-12 23:05 ` Damien Le Moal
2023-09-14 1:07 ` [PATCH v3 0/3] Minor cleanups Martin K. Petersen
2023-09-22 1:05 ` Martin K. Petersen
4 siblings, 0 replies; 6+ messages in thread
From: Damien Le Moal @ 2023-09-12 23:05 UTC (permalink / raw)
To: linux-scsi, Martin K . Petersen, John Garry
sas_discover_end_dev() is defined and used only in sas_discover.c.
Define this function as static.
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
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);
--
2.41.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 0/3] Minor cleanups
2023-09-12 23:05 [PATCH v3 0/3] Minor cleanups Damien Le Moal
` (2 preceding siblings ...)
2023-09-12 23:05 ` [PATCH v3 3/3] scsi: libsas: Declare sas_discover_end_dev() static Damien Le Moal
@ 2023-09-14 1:07 ` Martin K. Petersen
2023-09-22 1:05 ` Martin K. Petersen
4 siblings, 0 replies; 6+ messages in thread
From: Martin K. Petersen @ 2023-09-14 1:07 UTC (permalink / raw)
To: Damien Le Moal; +Cc: linux-scsi, Martin K . Petersen, John Garry
Damien,
> 3 patches to cleanup libsas functions declarations. No functional
> changes.
Applied to 6.7/scsi-staging, thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 0/3] Minor cleanups
2023-09-12 23:05 [PATCH v3 0/3] Minor cleanups Damien Le Moal
` (3 preceding siblings ...)
2023-09-14 1:07 ` [PATCH v3 0/3] Minor cleanups Martin K. Petersen
@ 2023-09-22 1:05 ` Martin K. Petersen
4 siblings, 0 replies; 6+ messages in thread
From: Martin K. Petersen @ 2023-09-22 1:05 UTC (permalink / raw)
To: linux-scsi, John Garry, Damien Le Moal; +Cc: Martin K . Petersen
On Wed, 13 Sep 2023 08:05:48 +0900, Damien Le Moal wrote:
> 3 patches to cleanup libsas functions declarations. No functional
> changes.
>
> Changes from v2:
> * Added argument name to sas_discover_event() in patch 1
> * Removed repeated word "used" from commit message of patch 3
> * Added Johannes' review tag
>
> [...]
Applied to 6.7/scsi-queue, thanks!
[1/3] scsi: libsas: Move local functions declarations to sas_internal.h
https://git.kernel.org/mkp/scsi/c/d10b11dcb08f
[2/3] scsi: libsas: Declare sas_set_phy_speed() static
https://git.kernel.org/mkp/scsi/c/9b52c1c6cafd
[3/3] scsi: libsas: Declare sas_discover_end_dev() static
https://git.kernel.org/mkp/scsi/c/1345a7d909a3
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-09-22 1:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-12 23:05 [PATCH v3 0/3] Minor cleanups Damien Le Moal
2023-09-12 23:05 ` [PATCH v3 1/3] scsi: libsas: Move local functions declarations to sas_internal.h Damien Le Moal
2023-09-12 23:05 ` [PATCH v3 2/3] scsi: libsas: Declare sas_set_phy_speed() static Damien Le Moal
2023-09-12 23:05 ` [PATCH v3 3/3] scsi: libsas: Declare sas_discover_end_dev() static Damien Le Moal
2023-09-14 1:07 ` [PATCH v3 0/3] Minor cleanups Martin K. Petersen
2023-09-22 1:05 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox