diff mbox series

[3/4] mmc: dw_mmc: rockchip: use common_caps

Message ID 20211124184603.3897245-4-john@metanate.com (mailing list archive)
State New, archived
Headers show
Series mmc: dw_mmc: start deprecating mshcN aliases | expand

Commit Message

John Keeping Nov. 24, 2021, 6:46 p.m. UTC
The capabilities for all instances are the same, so use common_caps
instead of caps/num_caps to remove the dependency on the mshcN device
tree alias.

Signed-off-by: John Keeping <john@metanate.com>
---
 drivers/mmc/host/dw_mmc-rockchip.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

Comments

Jaehoon Chung Nov. 25, 2021, 11:37 p.m. UTC | #1
On 11/25/21 3:46 AM, John Keeping wrote:
> The capabilities for all instances are the same, so use common_caps
> instead of caps/num_caps to remove the dependency on the mshcN device
> tree alias.
> 
> Signed-off-by: John Keeping <john@metanate.com>

Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

Best Regards,
Jaehoon Chung

> ---
>  drivers/mmc/host/dw_mmc-rockchip.c | 11 +----------
>  1 file changed, 1 insertion(+), 10 deletions(-)
> 
> diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
> index d36991acd6df..95d0ec0f5f3a 100644
> --- a/drivers/mmc/host/dw_mmc-rockchip.c
> +++ b/drivers/mmc/host/dw_mmc-rockchip.c
> @@ -300,21 +300,12 @@ static int dw_mci_rockchip_init(struct dw_mci *host)
>  	return 0;
>  }
>  
> -/* Common capabilities of RK3288 SoC */
> -static unsigned long dw_mci_rk3288_dwmmc_caps[4] = {
> -	MMC_CAP_CMD23,
> -	MMC_CAP_CMD23,
> -	MMC_CAP_CMD23,
> -	MMC_CAP_CMD23,
> -};
> -
>  static const struct dw_mci_drv_data rk2928_drv_data = {
>  	.init			= dw_mci_rockchip_init,
>  };
>  
>  static const struct dw_mci_drv_data rk3288_drv_data = {
> -	.caps			= dw_mci_rk3288_dwmmc_caps,
> -	.num_caps		= ARRAY_SIZE(dw_mci_rk3288_dwmmc_caps),
> +	.common_caps		= MMC_CAP_CMD23,
>  	.set_ios		= dw_mci_rk3288_set_ios,
>  	.execute_tuning		= dw_mci_rk3288_execute_tuning,
>  	.parse_dt		= dw_mci_rk3288_parse_dt,
>
diff mbox series

Patch

diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
index d36991acd6df..95d0ec0f5f3a 100644
--- a/drivers/mmc/host/dw_mmc-rockchip.c
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
@@ -300,21 +300,12 @@  static int dw_mci_rockchip_init(struct dw_mci *host)
 	return 0;
 }
 
-/* Common capabilities of RK3288 SoC */
-static unsigned long dw_mci_rk3288_dwmmc_caps[4] = {
-	MMC_CAP_CMD23,
-	MMC_CAP_CMD23,
-	MMC_CAP_CMD23,
-	MMC_CAP_CMD23,
-};
-
 static const struct dw_mci_drv_data rk2928_drv_data = {
 	.init			= dw_mci_rockchip_init,
 };
 
 static const struct dw_mci_drv_data rk3288_drv_data = {
-	.caps			= dw_mci_rk3288_dwmmc_caps,
-	.num_caps		= ARRAY_SIZE(dw_mci_rk3288_dwmmc_caps),
+	.common_caps		= MMC_CAP_CMD23,
 	.set_ios		= dw_mci_rk3288_set_ios,
 	.execute_tuning		= dw_mci_rk3288_execute_tuning,
 	.parse_dt		= dw_mci_rk3288_parse_dt,