Commit 47f55b74 authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman

spmi: do not use bus internal data

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: default avatarSudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7ff4bdd4
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
#include <trace/events/spmi.h> #include <trace/events/spmi.h>
static bool is_registered;
static DEFINE_IDA(ctrl_ida); static DEFINE_IDA(ctrl_ida);
static void spmi_dev_release(struct device *dev) static void spmi_dev_release(struct device *dev)
...@@ -507,7 +508,7 @@ int spmi_controller_add(struct spmi_controller *ctrl) ...@@ -507,7 +508,7 @@ int spmi_controller_add(struct spmi_controller *ctrl)
int ret; int ret;
/* Can't register until after driver model init */ /* Can't register until after driver model init */
if (WARN_ON(!spmi_bus_type.p)) if (WARN_ON(!is_registered))
return -EAGAIN; return -EAGAIN;
ret = device_add(&ctrl->dev); ret = device_add(&ctrl->dev);
...@@ -576,7 +577,14 @@ module_exit(spmi_exit); ...@@ -576,7 +577,14 @@ module_exit(spmi_exit);
static int __init spmi_init(void) static int __init spmi_init(void)
{ {
return bus_register(&spmi_bus_type); int ret;
ret = bus_register(&spmi_bus_type);
if (ret)
return ret;
is_registered = true;
return 0;
} }
postcore_initcall(spmi_init); postcore_initcall(spmi_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment