Skip to content

Commit

Permalink
of: unittest: fix I2C dependency
Browse files Browse the repository at this point in the history
The unittest fails to link if I2C or I2C_MUX is a loadable module:

  drivers/built-in.o: In function `selftest_i2c_mux_remove':
  unittest.c:(.text+0xb0ce4): undefined reference to `i2c_del_mux_adapter'

This changes the newly added IS_ENABLED() checks to use IS_BUILTIN()
instead, which evaluates to false if the other driver is a module.

Reported-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: d5e7550 ("of: unitest: Add I2C overlay unit tests.")
Signed-off-by: Rob Herring <robh@kernel.org>
  • Loading branch information
Arnd Bergmann authored and Rob Herring committed Mar 10, 2015
1 parent d3a8916 commit 4252de3
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/of/unittest.c
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,7 @@ static int of_path_platform_device_exists(const char *path)
return pdev != NULL;
}

#if IS_ENABLED(CONFIG_I2C)
#if IS_BUILTIN(CONFIG_I2C)

/* get the i2c client device instantiated at the path */
static struct i2c_client *of_path_to_i2c_client(const char *path)
Expand Down Expand Up @@ -1445,7 +1445,7 @@ static void of_selftest_overlay_11(void)
return;
}

#if IS_ENABLED(CONFIG_I2C) && IS_ENABLED(CONFIG_OF_OVERLAY)
#if IS_BUILTIN(CONFIG_I2C) && IS_ENABLED(CONFIG_OF_OVERLAY)

struct selftest_i2c_bus_data {
struct platform_device *pdev;
Expand Down Expand Up @@ -1584,7 +1584,7 @@ static struct i2c_driver selftest_i2c_dev_driver = {
.id_table = selftest_i2c_dev_id,
};

#if IS_ENABLED(CONFIG_I2C_MUX)
#if IS_BUILTIN(CONFIG_I2C_MUX)

struct selftest_i2c_mux_data {
int nchans;
Expand Down Expand Up @@ -1695,7 +1695,7 @@ static int of_selftest_overlay_i2c_init(void)
"could not register selftest i2c bus driver\n"))
return ret;

#if IS_ENABLED(CONFIG_I2C_MUX)
#if IS_BUILTIN(CONFIG_I2C_MUX)
ret = i2c_add_driver(&selftest_i2c_mux_driver);
if (selftest(ret == 0,
"could not register selftest i2c mux driver\n"))
Expand All @@ -1707,7 +1707,7 @@ static int of_selftest_overlay_i2c_init(void)

static void of_selftest_overlay_i2c_cleanup(void)
{
#if IS_ENABLED(CONFIG_I2C_MUX)
#if IS_BUILTIN(CONFIG_I2C_MUX)
i2c_del_driver(&selftest_i2c_mux_driver);
#endif
platform_driver_unregister(&selftest_i2c_bus_driver);
Expand Down Expand Up @@ -1814,7 +1814,7 @@ static void __init of_selftest_overlay(void)
of_selftest_overlay_10();
of_selftest_overlay_11();

#if IS_ENABLED(CONFIG_I2C)
#if IS_BUILTIN(CONFIG_I2C)
if (selftest(of_selftest_overlay_i2c_init() == 0, "i2c init failed\n"))
goto out;

Expand Down

0 comments on commit 4252de3

Please sign in to comment.