Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

of/device: Nullify match table in of_match_device() for CONFIG_OF=n

If the of_device_id table inside a device driver is protected by #ifdef
CONFIG_OF, the driver still has to provide a dummy declaration of the
table, or wrap it inside of_match_ptr(), when calling of_match_device()
in the CONFIG_OF=n case, else the driver fails to compile with e.g.

drivers/spi/spi-rspi.c: In function 'rspi_probe':
drivers/spi/spi-rspi.c:1203:26: error: 'rspi_of_match' undeclared (first use in this function)
drivers/spi/spi-rspi.c:1203:26: note: each undeclared identifier is reported only once for each function it appears in

Make of_match_device() nullify the table pointer if CONFIG_OF=n to fix
this.

Reported-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Signed-off-by: Rob Herring <robh@kernel.org>

authored by

Geert Uytterhoeven and committed by
Rob Herring
1db73ae3 e0667551

+3 -1
+3 -1
include/linux/of_device.h
··· 78 78 79 79 static inline void of_device_node_put(struct device *dev) { } 80 80 81 - static inline const struct of_device_id *of_match_device( 81 + static inline const struct of_device_id *__of_match_device( 82 82 const struct of_device_id *matches, const struct device *dev) 83 83 { 84 84 return NULL; 85 85 } 86 + #define of_match_device(matches, dev) \ 87 + __of_match_device(of_match_ptr(matches), (dev)) 86 88 87 89 static inline struct device_node *of_cpu_device_node_get(int cpu) 88 90 {