| Message ID | 20211124184603.3897245-3-john@metanate.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mmc: dw_mmc: start deprecating mshcN aliases | expand |
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-hi3798cv200.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/drivers/mmc/host/dw_mmc-hi3798cv200.c b/drivers/mmc/host/dw_mmc-hi3798cv200.c > index 39794f93826f..e9437ef8ef19 100644 > --- a/drivers/mmc/host/dw_mmc-hi3798cv200.c > +++ b/drivers/mmc/host/dw_mmc-hi3798cv200.c > @@ -23,12 +23,6 @@ struct hi3798cv200_priv { > struct clk *drive_clk; > }; > > -static unsigned long dw_mci_hi3798cv200_caps[] = { > - MMC_CAP_CMD23, > - MMC_CAP_CMD23, > - MMC_CAP_CMD23 > -}; > - > static void dw_mci_hi3798cv200_set_ios(struct dw_mci *host, struct mmc_ios *ios) > { > struct hi3798cv200_priv *priv = host->priv; > @@ -166,8 +160,7 @@ static int dw_mci_hi3798cv200_init(struct dw_mci *host) > } > > static const struct dw_mci_drv_data hi3798cv200_data = { > - .caps = dw_mci_hi3798cv200_caps, > - .num_caps = ARRAY_SIZE(dw_mci_hi3798cv200_caps), > + .common_caps = MMC_CAP_CMD23, > .init = dw_mci_hi3798cv200_init, > .set_ios = dw_mci_hi3798cv200_set_ios, > .execute_tuning = dw_mci_hi3798cv200_execute_tuning, >
diff --git a/drivers/mmc/host/dw_mmc-hi3798cv200.c b/drivers/mmc/host/dw_mmc-hi3798cv200.c index 39794f93826f..e9437ef8ef19 100644 --- a/drivers/mmc/host/dw_mmc-hi3798cv200.c +++ b/drivers/mmc/host/dw_mmc-hi3798cv200.c @@ -23,12 +23,6 @@ struct hi3798cv200_priv { struct clk *drive_clk; }; -static unsigned long dw_mci_hi3798cv200_caps[] = { - MMC_CAP_CMD23, - MMC_CAP_CMD23, - MMC_CAP_CMD23 -}; - static void dw_mci_hi3798cv200_set_ios(struct dw_mci *host, struct mmc_ios *ios) { struct hi3798cv200_priv *priv = host->priv; @@ -166,8 +160,7 @@ static int dw_mci_hi3798cv200_init(struct dw_mci *host) } static const struct dw_mci_drv_data hi3798cv200_data = { - .caps = dw_mci_hi3798cv200_caps, - .num_caps = ARRAY_SIZE(dw_mci_hi3798cv200_caps), + .common_caps = MMC_CAP_CMD23, .init = dw_mci_hi3798cv200_init, .set_ios = dw_mci_hi3798cv200_set_ios, .execute_tuning = dw_mci_hi3798cv200_execute_tuning,
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-hi3798cv200.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)