| Message ID | d05a34a1c5deb1d08b45b6caf44de9163d013699.camel@nedap.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | None | expand |
Hi Harm, On Fri, 6 Nov 2020 at 05:20, Harm Berntsen <harm.berntsen@nedap.com> wrote: > > The driver only needs to retrieve the pin for the ACPI info. The driver > itself works without depending on GPIO. > > Signed-off-by: Harm Berntsen <harm.berntsen@nedap.com> > CC: Simon Glass <sjg@chromium.org> > --- > Changes for v2: > - Changed ifdef to if (CONFIG_IS_ENABLED(DM_GPIO)) > > drivers/mmc/pci_mmc.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c > index 0c45e1b893..bd229693b0 100644 > --- a/drivers/mmc/pci_mmc.c > +++ b/drivers/mmc/pci_mmc.c > @@ -52,9 +52,11 @@ static int pci_mmc_probe(struct udevice *dev) > > static int pci_mmc_ofdata_to_platdata(struct udevice *dev) > { > - struct pci_mmc_priv *priv = dev_get_priv(dev); > + if (CONFIG_IS_ENABLED(DM_GPIO)) { > + struct pci_mmc_priv *priv = dev_get_priv(dev); > > - gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio, GPIOD_IS_IN); > + gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio, GPIOD_IS_IN); > + } This should work OK since priv is cleared to zeroes on init Reviewed-by: Simon Glass <sjg@chromium.org> > > return 0; > } > -- > 2.29.2 >
On Fri, Nov 06, 2020 at 12:20:44PM +0000, Harm Berntsen wrote: > The driver only needs to retrieve the pin for the ACPI info. The driver > itself works without depending on GPIO. > > Signed-off-by: Harm Berntsen <harm.berntsen@nedap.com> > CC: Simon Glass <sjg@chromium.org> > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/drivers/mmc/pci_mmc.c b/drivers/mmc/pci_mmc.c index 0c45e1b893..bd229693b0 100644 --- a/drivers/mmc/pci_mmc.c +++ b/drivers/mmc/pci_mmc.c @@ -52,9 +52,11 @@ static int pci_mmc_probe(struct udevice *dev) static int pci_mmc_ofdata_to_platdata(struct udevice *dev) { - struct pci_mmc_priv *priv = dev_get_priv(dev); + if (CONFIG_IS_ENABLED(DM_GPIO)) { + struct pci_mmc_priv *priv = dev_get_priv(dev); - gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio, GPIOD_IS_IN); + gpio_request_by_name(dev, "cd-gpios", 0, &priv->cd_gpio, GPIOD_IS_IN); + } return 0; }
The driver only needs to retrieve the pin for the ACPI info. The driver itself works without depending on GPIO. Signed-off-by: Harm Berntsen <harm.berntsen@nedap.com> CC: Simon Glass <sjg@chromium.org> --- Changes for v2: - Changed ifdef to if (CONFIG_IS_ENABLED(DM_GPIO)) drivers/mmc/pci_mmc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)