| Message ID | 20220202182450.54925-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v1,1/1] mmc: dw_mmc: Use device_property_string_array_count() | expand |
On Wed, 2 Feb 2022 at 19:24, Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > Use device_property_string_array_count() to get number of strings > in a string array property. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/dw_mmc.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c > index 99b201921954..3420a7ad6098 100644 > --- a/drivers/mmc/host/dw_mmc.c > +++ b/drivers/mmc/host/dw_mmc.c > @@ -3057,8 +3057,7 @@ static void dw_mci_init_dma(struct dw_mci *host) > dev_info(host->dev, "Using internal DMA controller.\n"); > } else { > /* TRANS_MODE_EDMAC: check dma bindings again */ > - if ((device_property_read_string_array(dev, "dma-names", > - NULL, 0) < 0) || > + if ((device_property_string_array_count(dev, "dma-names") < 0) || > !device_property_present(dev, "dmas")) { > goto no_dma; > } > -- > 2.34.1 >
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 99b201921954..3420a7ad6098 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -3057,8 +3057,7 @@ static void dw_mci_init_dma(struct dw_mci *host) dev_info(host->dev, "Using internal DMA controller.\n"); } else { /* TRANS_MODE_EDMAC: check dma bindings again */ - if ((device_property_read_string_array(dev, "dma-names", - NULL, 0) < 0) || + if ((device_property_string_array_count(dev, "dma-names") < 0) || !device_property_present(dev, "dmas")) { goto no_dma; }
Use device_property_string_array_count() to get number of strings in a string array property. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/mmc/host/dw_mmc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)