diff options
| author |   Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2016-03-07 17:19:17 +0530 |
|---|---|---|
| committer |   Wolfram Sang <wsa@the-dreams.de> | 2016-03-12 16:58:11 +0100 |
| commit | 95026658c46ea2d94498d0dac1282e28cd47c64a (patch) | |
| tree | b6785a2eca9069814a7c6f5f1d9d0c2e39e2352f /drivers/i2c/i2c-core.c | |
| parent | i2c: cadence: Fix the kernel-doc warnings (diff) | |
| download | wireguard-linux-95026658c46ea2d94498d0dac1282e28cd47c64a.tar.xz wireguard-linux-95026658c46ea2d94498d0dac1282e28cd47c64a.zip | |
i2c: do not use internal data from driver core
The variable p is a data structure which is used by the driver core
internally and it is not expected that busses will be directly accessing
these driver core internal only data.
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[wsa: removed the unlikely()]
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/i2c-core.c')
| -rw-r--r-- | drivers/i2c/i2c-core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 2949ab3c2293..f4726cdbb06a 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -73,6 +73,7 @@ static struct device_type i2c_client_type; static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver); static struct static_key i2c_trace_msg = STATIC_KEY_INIT_FALSE; +static bool is_registered; void i2c_transfer_trace_reg(void) { @@ -1529,7 +1530,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap) int res = 0; /* Can't register until after driver model init */ - if (unlikely(WARN_ON(!i2c_bus_type.p))) { + if (WARN_ON(!is_registered)) { res = -EAGAIN; goto out_list; } @@ -1926,7 +1927,7 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver) int res; /* Can't register until after driver model init */ - if (unlikely(WARN_ON(!i2c_bus_type.p))) + if (WARN_ON(!is_registered)) return -EAGAIN; /* add the driver to the list of i2c drivers in the driver core */ @@ -2118,6 +2119,7 @@ static int __init i2c_init(void) if (IS_ENABLED(CONFIG_OF_DYNAMIC)) WARN_ON(of_reconfig_notifier_register(&i2c_of_notifier)); + is_registered = true; return 0; class_err: |