aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2016-11-07 07:47:41 -0500
committerWolfram Sang <wsa@the-dreams.de>2016-11-17 10:10:23 -0500
commitb8a1a4cd5a98a2adf8dfd6902cd98e57d910ee12 (patch)
tree04583b1307471c580849c19d339440c2dc2e8479 /include/linux
parent5f441fcaa3ce54681923475cf0040216d190e646 (diff)
i2c: Provide a temporary .probe_new() call-back type
This will aid the seamless removal of the current probe()'s, more commonly unused than used second parameter. Most I2C drivers can simply switch over to the new interface, others which have DT support can use its own matching instead and others can call i2c_match_id() themselves. This brings I2C's device probe method into line with other similar interfaces in the kernel and prevents the requirement to pass an i2c_device_id table. Suggested-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> [Kieran: fix rebase conflicts and adapt for dev_pm_domain_{attach,detach}] Tested-by: Kieran Bingham <kieran@bingham.xyz> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com> Tested-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Kieran Bingham <kieran@bingham.xyz> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/i2c.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 7e00efd6a62f..82cf90945bb8 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -135,7 +135,8 @@ enum i2c_alert_protocol {
135 * struct i2c_driver - represent an I2C device driver 135 * struct i2c_driver - represent an I2C device driver
136 * @class: What kind of i2c device we instantiate (for detect) 136 * @class: What kind of i2c device we instantiate (for detect)
137 * @attach_adapter: Callback for bus addition (deprecated) 137 * @attach_adapter: Callback for bus addition (deprecated)
138 * @probe: Callback for device binding 138 * @probe: Callback for device binding - soon to be deprecated
139 * @probe_new: New callback for device binding
139 * @remove: Callback for device unbinding 140 * @remove: Callback for device unbinding
140 * @shutdown: Callback for device shutdown 141 * @shutdown: Callback for device shutdown
141 * @alert: Alert callback, for example for the SMBus alert protocol 142 * @alert: Alert callback, for example for the SMBus alert protocol
@@ -178,6 +179,11 @@ struct i2c_driver {
178 int (*probe)(struct i2c_client *, const struct i2c_device_id *); 179 int (*probe)(struct i2c_client *, const struct i2c_device_id *);
179 int (*remove)(struct i2c_client *); 180 int (*remove)(struct i2c_client *);
180 181
182 /* New driver model interface to aid the seamless removal of the
183 * current probe()'s, more commonly unused than used second parameter.
184 */
185 int (*probe_new)(struct i2c_client *);
186
181 /* driver model interfaces that don't relate to enumeration */ 187 /* driver model interfaces that don't relate to enumeration */
182 void (*shutdown)(struct i2c_client *); 188 void (*shutdown)(struct i2c_client *);
183 189