2023-03-30 01:52:43

by Stanley Chu

Subject: [PATCH v1] scsi: core: Cleanup struct ufs_saved_pwr_info

The "is_valid" field of the struct ufs_saved_pwr_info is no
longer used, and this struct can be replaced by struct
ufs_pa_layer_attr, without any changes to the functionality.

Signed-off-by: Stanley Chu <[email protected]>
---
drivers/ufs/core/ufshcd.c | 7 +++----
include/ufs/ufshcd.h | 7 +------
2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index c32a927ac5d1..97eb28a3006d 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -1269,7 +1269,7 @@ static int ufshcd_scale_gear(struct ufs_hba *hba, bool scale_up)
struct ufs_pa_layer_attr new_pwr_info;

if (scale_up) {
- memcpy(&new_pwr_info, &hba->clk_scaling.saved_pwr_info.info,
+ memcpy(&new_pwr_info, &hba->clk_scaling.saved_pwr_info,
sizeof(struct ufs_pa_layer_attr));
} else {
memcpy(&new_pwr_info, &hba->pwr_info,
@@ -1278,7 +1278,7 @@ static int ufshcd_scale_gear(struct ufs_hba *hba, bool scale_up)
if (hba->pwr_info.gear_tx > hba->clk_scaling.min_gear ||
hba->pwr_info.gear_rx > hba->clk_scaling.min_gear) {
/* save the current power mode */
- memcpy(&hba->clk_scaling.saved_pwr_info.info,
+ memcpy(&hba->clk_scaling.saved_pwr_info,
&hba->pwr_info,
sizeof(struct ufs_pa_layer_attr));

@@ -8424,10 +8424,9 @@ static int ufshcd_add_lus(struct ufs_hba *hba)

/* Initialize devfreq after UFS device is detected */
if (ufshcd_is_clkscaling_supported(hba)) {
- memcpy(&hba->clk_scaling.saved_pwr_info.info,
+ memcpy(&hba->clk_scaling.saved_pwr_info,
&hba->pwr_info,
sizeof(struct ufs_pa_layer_attr));
- hba->clk_scaling.saved_pwr_info.is_valid = true;
hba->clk_scaling.is_allowed = true;

ret = ufshcd_devfreq_init(hba);
diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index 431c3afb2ce0..2845fe7f45cd 100644
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -394,11 +394,6 @@ struct ufs_clk_gating {
struct workqueue_struct *clk_gating_workq;
};

-struct ufs_saved_pwr_info {
- struct ufs_pa_layer_attr info;
- bool is_valid;
-};
-
/**
* struct ufs_clk_scaling - UFS clock scaling related data
* @active_reqs: number of requests that are pending. If this is zero when
@@ -428,7 +423,7 @@ struct ufs_clk_scaling {
ktime_t window_start_t;
ktime_t busy_start_t;
struct device_attribute enable_attr;
- struct ufs_saved_pwr_info saved_pwr_info;
+ struct ufs_pa_layer_attr saved_pwr_info;
struct workqueue_struct *workq;
struct work_struct suspend_work;
struct work_struct resume_work;
--
2.18.0

2023-03-30 06:37:36

by Avri Altman

Subject: RE: [PATCH v1] scsi: core: Cleanup struct ufs_saved_pwr_info

>
> The "is_valid" field of the struct ufs_saved_pwr_info is no longer used, and
> this struct can be replaced by struct ufs_pa_layer_attr, without any changes
> to the functionality.
>
> Signed-off-by: Stanley Chu <[email protected]>
Reviewed-by: Avri Altman <[email protected]>

2023-04-03 01:17:11

by Martin K. Petersen

Subject: Re: [PATCH v1] scsi: core: Cleanup struct ufs_saved_pwr_info

Stanley,

> The "is_valid" field of the struct ufs_saved_pwr_info is no longer
> used, and this struct can be replaced by struct ufs_pa_layer_attr,
> without any changes to the functionality.

Applied to 6.4/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering