diff options
| author | Geert Uytterhoeven <geert+renesas@linux-m68k.org> | 2014-02-03 09:27:40 +0100 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-02-05 17:04:37 +0100 |
| commit | 1db73ae39a97797b7d929eca2af469f82fbb337a (patch) | |
| tree | dfd32fff6c6d1d1763301211f560603e659c66b9 /include | |
| parent | dt-bindings: add vendor-prefix for neonode (diff) | |
| download | linux-1db73ae39a97797b7d929eca2af469f82fbb337a.tar.xz linux-1db73ae39a97797b7d929eca2af469f82fbb337a.zip | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/of_device.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/of_device.h b/include/linux/of_device.h index 8d7dd6768cb7..ef370210ffb2 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -78,11 +78,13 @@ static inline int of_device_uevent_modalias(struct device *dev, static inline void of_device_node_put(struct device *dev) { } -static inline const struct of_device_id *of_match_device( +static inline const struct of_device_id *__of_match_device( const struct of_device_id *matches, const struct device *dev) { return NULL; } +#define of_match_device(matches, dev) \ + __of_match_device(of_match_ptr(matches), (dev)) static inline struct device_node *of_cpu_device_node_get(int cpu) { |