| Message ID | 20241007114918.52066-1-brgl@bgdev.pl |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] mmc: davinci: order includes alphabetically | expand |
On Mon, 7 Oct 2024 at 13:49, Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > For better readability, put all header inclusions in alphabetical order. > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/davinci_mmc.c | 23 +++++++++++------------ > 1 file changed, 11 insertions(+), 12 deletions(-) > > diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c > index 7ed533758dbe..fe7712532e84 100644 > --- a/drivers/mmc/host/davinci_mmc.c > +++ b/drivers/mmc/host/davinci_mmc.c > @@ -7,24 +7,23 @@ > * Copyright (C) 2009 David Brownell > */ > > -#include <linux/module.h> > -#include <linux/ioport.h> > -#include <linux/platform_device.h> > #include <linux/clk.h> > -#include <linux/err.h> > #include <linux/cpufreq.h> > -#include <linux/mmc/host.h> > -#include <linux/io.h> > -#include <linux/irq.h> > #include <linux/delay.h> > -#include <linux/dmaengine.h> > #include <linux/dma-mapping.h> > -#include <linux/mmc/mmc.h> > -#include <linux/of.h> > -#include <linux/mmc/slot-gpio.h> > +#include <linux/dmaengine.h> > +#include <linux/err.h> > #include <linux/interrupt.h> > - > +#include <linux/io.h> > +#include <linux/ioport.h> > +#include <linux/irq.h> > +#include <linux/mmc/host.h> > +#include <linux/mmc/mmc.h> > +#include <linux/mmc/slot-gpio.h> > +#include <linux/module.h> > +#include <linux/of.h> > #include <linux/platform_data/mmc-davinci.h> > +#include <linux/platform_device.h> > > /* > * Register Definitions > -- > 2.43.0 >
On Mon, 7 Oct 2024 at 13:49, Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > There's no reason for this driver to use the OF-specific variant so > switch to using the generic device_get_match_data() helper instead. > > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/davinci_mmc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c > index fe7712532e84..cde4c4339ab7 100644 > --- a/drivers/mmc/host/davinci_mmc.c > +++ b/drivers/mmc/host/davinci_mmc.c > @@ -21,9 +21,9 @@ > #include <linux/mmc/mmc.h> > #include <linux/mmc/slot-gpio.h> > #include <linux/module.h> > -#include <linux/of.h> > #include <linux/platform_data/mmc-davinci.h> > #include <linux/platform_device.h> > +#include <linux/property.h> > > /* > * Register Definitions > @@ -1228,7 +1228,7 @@ static int davinci_mmcsd_probe(struct platform_device *pdev) > > host->mmc_input_clk = clk_get_rate(host->clk); > > - pdev->id_entry = of_device_get_match_data(&pdev->dev); > + pdev->id_entry = device_get_match_data(&pdev->dev); > if (pdev->id_entry) { > ret = mmc_of_parse(mmc); > if (ret) { > -- > 2.43.0 >
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c index 7ed533758dbe..fe7712532e84 100644 --- a/drivers/mmc/host/davinci_mmc.c +++ b/drivers/mmc/host/davinci_mmc.c @@ -7,24 +7,23 @@ * Copyright (C) 2009 David Brownell */ -#include <linux/module.h> -#include <linux/ioport.h> -#include <linux/platform_device.h> #include <linux/clk.h> -#include <linux/err.h> #include <linux/cpufreq.h> -#include <linux/mmc/host.h> -#include <linux/io.h> -#include <linux/irq.h> #include <linux/delay.h> -#include <linux/dmaengine.h> #include <linux/dma-mapping.h> -#include <linux/mmc/mmc.h> -#include <linux/of.h> -#include <linux/mmc/slot-gpio.h> +#include <linux/dmaengine.h> +#include <linux/err.h> #include <linux/interrupt.h> - +#include <linux/io.h> +#include <linux/ioport.h> +#include <linux/irq.h> +#include <linux/mmc/host.h> +#include <linux/mmc/mmc.h> +#include <linux/mmc/slot-gpio.h> +#include <linux/module.h> +#include <linux/of.h> #include <linux/platform_data/mmc-davinci.h> +#include <linux/platform_device.h> /* * Register Definitions