| Message ID | 20241004125821.47525-1-brgl@bgdev.pl (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 98cb476c98e9fb3287aa69b05baf986b7126664b |
| Headers | show |
| Series | PCI/pwrctl: pwrseq: don't use OF-specific routines | expand |
On Fri, Oct 04, 2024 at 02:58:21PM +0200, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > This driver doesn't need to use OF interfaces directly. Replace the > single usage of an of_ function and replace it with a generic device > property variant. Drop the of.h header and pull in property.h instead. > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Applied to pci/pwrseq for v6.13, thanks. > --- > Bjorn: This may conflict with [1] but this should go for v6.13 while [1] > is a fix that's targetting v6.12. If git doesn't figure it out then the > resolution is trivial, just add <linux/property.h> in both and drop > <linux/of.h>. > > [1] https://lore.kernel.org/linux-pci/20241004125227.46514-1-brgl@bgdev.pl/ > > drivers/pci/pwrctl/pci-pwrctl-pwrseq.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/pwrctl/pci-pwrctl-pwrseq.c b/drivers/pci/pwrctl/pci-pwrctl-pwrseq.c > index a23a4312574b..d3f960612cf3 100644 > --- a/drivers/pci/pwrctl/pci-pwrctl-pwrseq.c > +++ b/drivers/pci/pwrctl/pci-pwrctl-pwrseq.c > @@ -6,9 +6,9 @@ > #include <linux/device.h> > #include <linux/mod_devicetable.h> > #include <linux/module.h> > -#include <linux/of.h> > #include <linux/pci-pwrctl.h> > #include <linux/platform_device.h> > +#include <linux/property.h> > #include <linux/pwrseq/consumer.h> > #include <linux/slab.h> > #include <linux/types.h> > @@ -35,7 +35,7 @@ static int pci_pwrctl_pwrseq_probe(struct platform_device *pdev) > if (!data) > return -ENOMEM; > > - data->pwrseq = devm_pwrseq_get(dev, of_device_get_match_data(dev)); > + data->pwrseq = devm_pwrseq_get(dev, device_get_match_data(dev)); > if (IS_ERR(data->pwrseq)) > return dev_err_probe(dev, PTR_ERR(data->pwrseq), > "Failed to get the power sequencer\n"); > -- > 2.43.0 >
diff --git a/drivers/pci/pwrctl/pci-pwrctl-pwrseq.c b/drivers/pci/pwrctl/pci-pwrctl-pwrseq.c index a23a4312574b..d3f960612cf3 100644 --- a/drivers/pci/pwrctl/pci-pwrctl-pwrseq.c +++ b/drivers/pci/pwrctl/pci-pwrctl-pwrseq.c @@ -6,9 +6,9 @@ #include <linux/device.h> #include <linux/mod_devicetable.h> #include <linux/module.h> -#include <linux/of.h> #include <linux/pci-pwrctl.h> #include <linux/platform_device.h> +#include <linux/property.h> #include <linux/pwrseq/consumer.h> #include <linux/slab.h> #include <linux/types.h> @@ -35,7 +35,7 @@ static int pci_pwrctl_pwrseq_probe(struct platform_device *pdev) if (!data) return -ENOMEM; - data->pwrseq = devm_pwrseq_get(dev, of_device_get_match_data(dev)); + data->pwrseq = devm_pwrseq_get(dev, device_get_match_data(dev)); if (IS_ERR(data->pwrseq)) return dev_err_probe(dev, PTR_ERR(data->pwrseq), "Failed to get the power sequencer\n");