Since the driver hi6421-regulator depends on CONFIG_OF,
it makes no difference to wrap of_match_ptr() here.
Remove of_match_ptr() macros to clean it up.
While at it, add missing mod_devicetable.h.
Reported-by: Stephen Rothwell <[email protected]>
Closes: https://lore.kernel.org/r/[email protected]
Fixes: 5d04660b29fb ("fpga: ice40-spi: Remove unused of_gpio.h")
Signed-off-by: Andy Shevchenko <[email protected]>
---
drivers/fpga/ice40-spi.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/fpga/ice40-spi.c b/drivers/fpga/ice40-spi.c
index 46927945f1b9..62c30266130d 100644
--- a/drivers/fpga/ice40-spi.c
+++ b/drivers/fpga/ice40-spi.c
@@ -10,6 +10,7 @@
#include <linux/fpga/fpga-mgr.h>
#include <linux/gpio/consumer.h>
+#include <linux/mod_devicetable.h>
#include <linux/module.h>
#include <linux/spi/spi.h>
#include <linux/stringify.h>
@@ -198,7 +199,7 @@ static struct spi_driver ice40_fpga_driver = {
.probe = ice40_fpga_probe,
.driver = {
.name = "ice40spi",
- .of_match_table = of_match_ptr(ice40_fpga_of_match),
+ .of_match_table = ice40_fpga_of_match,
},
.id_table = ice40_fpga_spi_ids,
};
--
2.43.0.rc1.1336.g36b5255a03ac
On Fri, Apr 12, 2024 at 06:58:30PM +0300, Andy Shevchenko wrote:
> Since the driver hi6421-regulator depends on CONFIG_OF,
^
It is ice40-spi
> it makes no difference to wrap of_match_ptr() here.
>
> Remove of_match_ptr() macros to clean it up.
>
> While at it, add missing mod_devicetable.h.
>
> Reported-by: Stephen Rothwell <[email protected]>
> Closes: https://lore.kernel.org/r/[email protected]
> Fixes: 5d04660b29fb ("fpga: ice40-spi: Remove unused of_gpio.h")
Since 5d04660b29fb is not merged yet, could you just merge them into one?
Or it breaks bisecting.
> Signed-off-by: Andy Shevchenko <[email protected]>
> ---
> drivers/fpga/ice40-spi.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/fpga/ice40-spi.c b/drivers/fpga/ice40-spi.c
> index 46927945f1b9..62c30266130d 100644
> --- a/drivers/fpga/ice40-spi.c
> +++ b/drivers/fpga/ice40-spi.c
> @@ -10,6 +10,7 @@
>
> #include <linux/fpga/fpga-mgr.h>
> #include <linux/gpio/consumer.h>
> +#include <linux/mod_devicetable.h>
> #include <linux/module.h>
> #include <linux/spi/spi.h>
> #include <linux/stringify.h>
> @@ -198,7 +199,7 @@ static struct spi_driver ice40_fpga_driver = {
> .probe = ice40_fpga_probe,
> .driver = {
> .name = "ice40spi",
> - .of_match_table = of_match_ptr(ice40_fpga_of_match),
> + .of_match_table = ice40_fpga_of_match,
It works, thanks for quick fix.
Yilun
> },
> .id_table = ice40_fpga_spi_ids,
> };
> --
> 2.43.0.rc1.1336.g36b5255a03ac
>
>
On Sat, Apr 13, 2024 at 10:56:10AM +0800, Xu Yilun wrote:
> On Fri, Apr 12, 2024 at 06:58:30PM +0300, Andy Shevchenko wrote:
> > Since the driver hi6421-regulator depends on CONFIG_OF,
> ^
> It is ice40-spi
Oops, copy-and-paste typo.
> > it makes no difference to wrap of_match_ptr() here.
> >
> > Remove of_match_ptr() macros to clean it up.
> >
> > While at it, add missing mod_devicetable.h.
> >
> > Reported-by: Stephen Rothwell <[email protected]>
> > Closes: https://lore.kernel.org/r/[email protected]
> > Fixes: 5d04660b29fb ("fpga: ice40-spi: Remove unused of_gpio.h")
>
> Since 5d04660b29fb is not merged yet, could you just merge them into one?
> Or it breaks bisecting.
You can also fold it, but sure, I'll send a v2.
--
With Best Regards,
Andy Shevchenko