Skip to content

Commit

Permalink
of/device: Nullify match table in of_match_device() for CONFIG_OF=n
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Geert Uytterhoeven authored and Rob Herring committed Feb 5, 2014
1 parent e066755 commit 1db73ae
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion include/linux/of_device.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit 1db73ae

Please sign in to comment.