Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio: potentiometer: mcp4531: Use i2c_get_match_data()
Replace device_get_match_data() and i2c_match_id() by i2c_get_match
_data() by making similar I2C and DT-based matching table.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20230723102743.102284-1-biju.das.jz@bp.renesas.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
authored by
Biju Das
and committed by
Jonathan Cameron
9afc8c6d
b68adc0e
+71
-68
+71
-68
drivers/iio/potentiometer/mcp4531.c
+71
-68
drivers/iio/potentiometer/mcp4531.c
···
206
206
.write_raw = mcp4531_write_raw,
207
207
};
208
208
209
+
#define MCP4531_ID_TABLE(_name, cfg) { \
210
+
.name = _name, \
211
+
.driver_data = (kernel_ulong_t)&mcp4531_cfg[cfg], \
212
+
}
213
+
209
214
static const struct i2c_device_id mcp4531_id[] = {
210
-
{ "mcp4531-502", MCP453x_502 },
211
-
{ "mcp4531-103", MCP453x_103 },
212
-
{ "mcp4531-503", MCP453x_503 },
213
-
{ "mcp4531-104", MCP453x_104 },
214
-
{ "mcp4532-502", MCP453x_502 },
215
-
{ "mcp4532-103", MCP453x_103 },
216
-
{ "mcp4532-503", MCP453x_503 },
217
-
{ "mcp4532-104", MCP453x_104 },
218
-
{ "mcp4541-502", MCP454x_502 },
219
-
{ "mcp4541-103", MCP454x_103 },
220
-
{ "mcp4541-503", MCP454x_503 },
221
-
{ "mcp4541-104", MCP454x_104 },
222
-
{ "mcp4542-502", MCP454x_502 },
223
-
{ "mcp4542-103", MCP454x_103 },
224
-
{ "mcp4542-503", MCP454x_503 },
225
-
{ "mcp4542-104", MCP454x_104 },
226
-
{ "mcp4551-502", MCP455x_502 },
227
-
{ "mcp4551-103", MCP455x_103 },
228
-
{ "mcp4551-503", MCP455x_503 },
229
-
{ "mcp4551-104", MCP455x_104 },
230
-
{ "mcp4552-502", MCP455x_502 },
231
-
{ "mcp4552-103", MCP455x_103 },
232
-
{ "mcp4552-503", MCP455x_503 },
233
-
{ "mcp4552-104", MCP455x_104 },
234
-
{ "mcp4561-502", MCP456x_502 },
235
-
{ "mcp4561-103", MCP456x_103 },
236
-
{ "mcp4561-503", MCP456x_503 },
237
-
{ "mcp4561-104", MCP456x_104 },
238
-
{ "mcp4562-502", MCP456x_502 },
239
-
{ "mcp4562-103", MCP456x_103 },
240
-
{ "mcp4562-503", MCP456x_503 },
241
-
{ "mcp4562-104", MCP456x_104 },
242
-
{ "mcp4631-502", MCP463x_502 },
243
-
{ "mcp4631-103", MCP463x_103 },
244
-
{ "mcp4631-503", MCP463x_503 },
245
-
{ "mcp4631-104", MCP463x_104 },
246
-
{ "mcp4632-502", MCP463x_502 },
247
-
{ "mcp4632-103", MCP463x_103 },
248
-
{ "mcp4632-503", MCP463x_503 },
249
-
{ "mcp4632-104", MCP463x_104 },
250
-
{ "mcp4641-502", MCP464x_502 },
251
-
{ "mcp4641-103", MCP464x_103 },
252
-
{ "mcp4641-503", MCP464x_503 },
253
-
{ "mcp4641-104", MCP464x_104 },
254
-
{ "mcp4642-502", MCP464x_502 },
255
-
{ "mcp4642-103", MCP464x_103 },
256
-
{ "mcp4642-503", MCP464x_503 },
257
-
{ "mcp4642-104", MCP464x_104 },
258
-
{ "mcp4651-502", MCP465x_502 },
259
-
{ "mcp4651-103", MCP465x_103 },
260
-
{ "mcp4651-503", MCP465x_503 },
261
-
{ "mcp4651-104", MCP465x_104 },
262
-
{ "mcp4652-502", MCP465x_502 },
263
-
{ "mcp4652-103", MCP465x_103 },
264
-
{ "mcp4652-503", MCP465x_503 },
265
-
{ "mcp4652-104", MCP465x_104 },
266
-
{ "mcp4661-502", MCP466x_502 },
267
-
{ "mcp4661-103", MCP466x_103 },
268
-
{ "mcp4661-503", MCP466x_503 },
269
-
{ "mcp4661-104", MCP466x_104 },
270
-
{ "mcp4662-502", MCP466x_502 },
271
-
{ "mcp4662-103", MCP466x_103 },
272
-
{ "mcp4662-503", MCP466x_503 },
273
-
{ "mcp4662-104", MCP466x_104 },
274
-
{}
215
+
MCP4531_ID_TABLE("mcp4531-502", MCP453x_502),
216
+
MCP4531_ID_TABLE("mcp4531-103", MCP453x_103),
217
+
MCP4531_ID_TABLE("mcp4531-503", MCP453x_503),
218
+
MCP4531_ID_TABLE("mcp4531-104", MCP453x_104),
219
+
MCP4531_ID_TABLE("mcp4532-502", MCP453x_502),
220
+
MCP4531_ID_TABLE("mcp4532-103", MCP453x_103),
221
+
MCP4531_ID_TABLE("mcp4532-503", MCP453x_503),
222
+
MCP4531_ID_TABLE("mcp4532-104", MCP453x_104),
223
+
MCP4531_ID_TABLE("mcp4541-502", MCP454x_502),
224
+
MCP4531_ID_TABLE("mcp4541-103", MCP454x_103),
225
+
MCP4531_ID_TABLE("mcp4541-503", MCP454x_503),
226
+
MCP4531_ID_TABLE("mcp4541-104", MCP454x_104),
227
+
MCP4531_ID_TABLE("mcp4542-502", MCP454x_502),
228
+
MCP4531_ID_TABLE("mcp4542-103", MCP454x_103),
229
+
MCP4531_ID_TABLE("mcp4542-503", MCP454x_503),
230
+
MCP4531_ID_TABLE("mcp4542-104", MCP454x_104),
231
+
MCP4531_ID_TABLE("mcp4551-502", MCP455x_502),
232
+
MCP4531_ID_TABLE("mcp4551-103", MCP455x_103),
233
+
MCP4531_ID_TABLE("mcp4551-503", MCP455x_503),
234
+
MCP4531_ID_TABLE("mcp4551-104", MCP455x_104),
235
+
MCP4531_ID_TABLE("mcp4552-502", MCP455x_502),
236
+
MCP4531_ID_TABLE("mcp4552-103", MCP455x_103),
237
+
MCP4531_ID_TABLE("mcp4552-503", MCP455x_503),
238
+
MCP4531_ID_TABLE("mcp4552-104", MCP455x_104),
239
+
MCP4531_ID_TABLE("mcp4561-502", MCP456x_502),
240
+
MCP4531_ID_TABLE("mcp4561-103", MCP456x_103),
241
+
MCP4531_ID_TABLE("mcp4561-503", MCP456x_503),
242
+
MCP4531_ID_TABLE("mcp4561-104", MCP456x_104),
243
+
MCP4531_ID_TABLE("mcp4562-502", MCP456x_502),
244
+
MCP4531_ID_TABLE("mcp4562-103", MCP456x_103),
245
+
MCP4531_ID_TABLE("mcp4562-503", MCP456x_503),
246
+
MCP4531_ID_TABLE("mcp4562-104", MCP456x_104),
247
+
MCP4531_ID_TABLE("mcp4631-502", MCP463x_502),
248
+
MCP4531_ID_TABLE("mcp4631-103", MCP463x_103),
249
+
MCP4531_ID_TABLE("mcp4631-503", MCP463x_503),
250
+
MCP4531_ID_TABLE("mcp4631-104", MCP463x_104),
251
+
MCP4531_ID_TABLE("mcp4632-502", MCP463x_502),
252
+
MCP4531_ID_TABLE("mcp4632-103", MCP463x_103),
253
+
MCP4531_ID_TABLE("mcp4632-503", MCP463x_503),
254
+
MCP4531_ID_TABLE("mcp4632-104", MCP463x_104),
255
+
MCP4531_ID_TABLE("mcp4641-502", MCP464x_502),
256
+
MCP4531_ID_TABLE("mcp4641-103", MCP464x_103),
257
+
MCP4531_ID_TABLE("mcp4641-503", MCP464x_503),
258
+
MCP4531_ID_TABLE("mcp4641-104", MCP464x_104),
259
+
MCP4531_ID_TABLE("mcp4642-502", MCP464x_502),
260
+
MCP4531_ID_TABLE("mcp4642-103", MCP464x_103),
261
+
MCP4531_ID_TABLE("mcp4642-503", MCP464x_503),
262
+
MCP4531_ID_TABLE("mcp4642-104", MCP464x_104),
263
+
MCP4531_ID_TABLE("mcp4651-502", MCP465x_502),
264
+
MCP4531_ID_TABLE("mcp4651-103", MCP465x_103),
265
+
MCP4531_ID_TABLE("mcp4651-503", MCP465x_503),
266
+
MCP4531_ID_TABLE("mcp4651-104", MCP465x_104),
267
+
MCP4531_ID_TABLE("mcp4652-502", MCP465x_502),
268
+
MCP4531_ID_TABLE("mcp4652-103", MCP465x_103),
269
+
MCP4531_ID_TABLE("mcp4652-503", MCP465x_503),
270
+
MCP4531_ID_TABLE("mcp4652-104", MCP465x_104),
271
+
MCP4531_ID_TABLE("mcp4661-502", MCP466x_502),
272
+
MCP4531_ID_TABLE("mcp4661-103", MCP466x_103),
273
+
MCP4531_ID_TABLE("mcp4661-503", MCP466x_503),
274
+
MCP4531_ID_TABLE("mcp4661-104", MCP466x_104),
275
+
MCP4531_ID_TABLE("mcp4662-502", MCP466x_502),
276
+
MCP4531_ID_TABLE("mcp4662-103", MCP466x_103),
277
+
MCP4531_ID_TABLE("mcp4662-503", MCP466x_503),
278
+
MCP4531_ID_TABLE("mcp4662-104", MCP466x_104),
279
+
{ /* sentinel */ }
275
280
};
276
281
MODULE_DEVICE_TABLE(i2c, mcp4531_id);
277
282
···
373
368
i2c_set_clientdata(client, indio_dev);
374
369
data->client = client;
375
370
376
-
data->cfg = device_get_match_data(dev);
377
-
if (!data->cfg)
378
-
data->cfg = &mcp4531_cfg[i2c_match_id(mcp4531_id, client)->driver_data];
371
+
data->cfg = i2c_get_match_data(client);
379
372
380
373
indio_dev->info = &mcp4531_info;
381
374
indio_dev->channels = mcp4531_channels;