| Message ID | 20201125033630.603863-1-jeremy.linton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | mmc: sdhci: Use more concise device_property_read_u64 | expand |
On 25/11/20 5:36 am, Jeremy Linton wrote: > Since we only need a single u64 the _array form is > unnecessarily. Use device_property_read_u64 instead. > > Signed-off-by: Jeremy Linton <jeremy.linton@arm.com> Thank you :-) Acked-by: Adrian Hunter <adrian.hunter@intel.com> > --- > drivers/mmc/host/sdhci.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index feba64fbde16..ad4ae88a7f74 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -3992,10 +3992,10 @@ void __sdhci_read_caps(struct sdhci_host *host, const u16 *ver, > if (host->v4_mode) > sdhci_do_enable_v4_mode(host); > > - device_property_read_u64_array(mmc_dev(host->mmc), > - "sdhci-caps-mask", &dt_caps_mask, 1); > - device_property_read_u64_array(mmc_dev(host->mmc), > - "sdhci-caps", &dt_caps, 1); > + device_property_read_u64(mmc_dev(host->mmc), > + "sdhci-caps-mask", &dt_caps_mask); > + device_property_read_u64(mmc_dev(host->mmc), > + "sdhci-caps", &dt_caps); > > v = ver ? *ver : sdhci_readw(host, SDHCI_HOST_VERSION); > host->version = (v & SDHCI_SPEC_VER_MASK) >> SDHCI_SPEC_VER_SHIFT; >
On Wed, 25 Nov 2020 at 04:36, Jeremy Linton <jeremy.linton@arm.com> wrote: > > Since we only need a single u64 the _array form is > unnecessarily. Use device_property_read_u64 instead. > > Signed-off-by: Jeremy Linton <jeremy.linton@arm.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/sdhci.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > index feba64fbde16..ad4ae88a7f74 100644 > --- a/drivers/mmc/host/sdhci.c > +++ b/drivers/mmc/host/sdhci.c > @@ -3992,10 +3992,10 @@ void __sdhci_read_caps(struct sdhci_host *host, const u16 *ver, > if (host->v4_mode) > sdhci_do_enable_v4_mode(host); > > - device_property_read_u64_array(mmc_dev(host->mmc), > - "sdhci-caps-mask", &dt_caps_mask, 1); > - device_property_read_u64_array(mmc_dev(host->mmc), > - "sdhci-caps", &dt_caps, 1); > + device_property_read_u64(mmc_dev(host->mmc), > + "sdhci-caps-mask", &dt_caps_mask); > + device_property_read_u64(mmc_dev(host->mmc), > + "sdhci-caps", &dt_caps); > > v = ver ? *ver : sdhci_readw(host, SDHCI_HOST_VERSION); > host->version = (v & SDHCI_SPEC_VER_MASK) >> SDHCI_SPEC_VER_SHIFT; > -- > 2.26.2 >
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index feba64fbde16..ad4ae88a7f74 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -3992,10 +3992,10 @@ void __sdhci_read_caps(struct sdhci_host *host, const u16 *ver, if (host->v4_mode) sdhci_do_enable_v4_mode(host); - device_property_read_u64_array(mmc_dev(host->mmc), - "sdhci-caps-mask", &dt_caps_mask, 1); - device_property_read_u64_array(mmc_dev(host->mmc), - "sdhci-caps", &dt_caps, 1); + device_property_read_u64(mmc_dev(host->mmc), + "sdhci-caps-mask", &dt_caps_mask); + device_property_read_u64(mmc_dev(host->mmc), + "sdhci-caps", &dt_caps); v = ver ? *ver : sdhci_readw(host, SDHCI_HOST_VERSION); host->version = (v & SDHCI_SPEC_VER_MASK) >> SDHCI_SPEC_VER_SHIFT;
Since we only need a single u64 the _array form is unnecessarily. Use device_property_read_u64 instead. Signed-off-by: Jeremy Linton <jeremy.linton@arm.com> --- drivers/mmc/host/sdhci.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.26.2