tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Input: ads7846 - add short-hand for spi->dev in probe() function

This will make the code a bit more terse.
No functional change intended.

Signed-off-by: Daniel Mack <daniel@zonque.org>
Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>
Link: https://lore.kernel.org/r/20210907200726.2034962-2-daniel@zonque.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

authored by

Daniel Mack and committed by
Dmitry Torokhov de609b56 daf87bff

+23 -22
+23 -22
drivers/input/touchscreen/ads7846.c
··· 1216 1216 { 1217 1217 const struct ads7846_platform_data *pdata; 1218 1218 struct ads7846 *ts; 1219 + struct device *dev = &spi->dev; 1219 1220 struct ads7846_packet *packet; 1220 1221 struct input_dev *input_dev; 1221 1222 unsigned long irq_flags; 1222 1223 int err; 1223 1224 1224 1225 if (!spi->irq) { 1225 - dev_dbg(&spi->dev, "no IRQ?\n"); 1226 + dev_dbg(dev, "no IRQ?\n"); 1226 1227 return -EINVAL; 1227 1228 } 1228 1229 1229 1230 /* don't exceed max specified sample rate */ 1230 1231 if (spi->max_speed_hz > (125000 * SAMPLE_BITS)) { 1231 - dev_err(&spi->dev, "f(sample) %d KHz?\n", 1232 - (spi->max_speed_hz/SAMPLE_BITS)/1000); 1232 + dev_err(dev, "f(sample) %d KHz?\n", 1233 + (spi->max_speed_hz/SAMPLE_BITS)/1000); 1233 1234 return -EINVAL; 1234 1235 } 1235 1236 ··· 1263 1262 mutex_init(&ts->lock); 1264 1263 init_waitqueue_head(&ts->wait); 1265 1264 1266 - pdata = dev_get_platdata(&spi->dev); 1265 + pdata = dev_get_platdata(dev); 1267 1266 if (!pdata) { 1268 - pdata = ads7846_probe_dt(&spi->dev); 1267 + pdata = ads7846_probe_dt(dev); 1269 1268 if (IS_ERR(pdata)) { 1270 1269 err = PTR_ERR(pdata); 1271 1270 goto err_free_mem; ··· 1307 1306 1308 1307 ts->wait_for_sync = pdata->wait_for_sync ? : null_wait_for_sync; 1309 1308 1310 - snprintf(ts->phys, sizeof(ts->phys), "%s/input0", dev_name(&spi->dev)); 1309 + snprintf(ts->phys, sizeof(ts->phys), "%s/input0", dev_name(dev)); 1311 1310 snprintf(ts->name, sizeof(ts->name), "ADS%d Touchscreen", ts->model); 1312 1311 1313 1312 input_dev->name = ts->name; 1314 1313 input_dev->phys = ts->phys; 1315 - input_dev->dev.parent = &spi->dev; 1314 + input_dev->dev.parent = dev; 1316 1315 1317 1316 input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS); 1318 1317 input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH); ··· 1346 1345 1347 1346 ads7846_setup_spi_msg(ts, pdata); 1348 1347 1349 - ts->reg = regulator_get(&spi->dev, "vcc"); 1348 + ts->reg = regulator_get(dev, "vcc"); 1350 1349 if (IS_ERR(ts->reg)) { 1351 1350 err = PTR_ERR(ts->reg); 1352 - dev_err(&spi->dev, "unable to get regulator: %d\n", err); 1351 + dev_err(dev, "unable to get regulator: %d\n", err); 1353 1352 goto err_free_gpio; 1354 1353 } 1355 1354 1356 1355 err = regulator_enable(ts->reg); 1357 1356 if (err) { 1358 - dev_err(&spi->dev, "unable to enable regulator: %d\n", err); 1357 + dev_err(dev, "unable to enable regulator: %d\n", err); 1359 1358 goto err_put_regulator; 1360 1359 } 1361 1360 ··· 1363 1362 irq_flags |= IRQF_ONESHOT; 1364 1363 1365 1364 err = request_threaded_irq(spi->irq, ads7846_hard_irq, ads7846_irq, 1366 - irq_flags, spi->dev.driver->name, ts); 1365 + irq_flags, dev->driver->name, ts); 1367 1366 if (err && !pdata->irq_flags) { 1368 - dev_info(&spi->dev, 1367 + dev_info(dev, 1369 1368 "trying pin change workaround on irq %d\n", spi->irq); 1370 1369 irq_flags |= IRQF_TRIGGER_RISING; 1371 1370 err = request_threaded_irq(spi->irq, 1372 1371 ads7846_hard_irq, ads7846_irq, 1373 - irq_flags, spi->dev.driver->name, ts); 1372 + irq_flags, dev->driver->name, ts); 1374 1373 } 1375 1374 1376 1375 if (err) { 1377 - dev_dbg(&spi->dev, "irq %d busy?\n", spi->irq); 1376 + dev_dbg(dev, "irq %d busy?\n", spi->irq); 1378 1377 goto err_disable_regulator; 1379 1378 } 1380 1379 ··· 1382 1381 if (err) 1383 1382 goto err_free_irq; 1384 1383 1385 - dev_info(&spi->dev, "touchscreen, irq %d\n", spi->irq); 1384 + dev_info(dev, "touchscreen, irq %d\n", spi->irq); 1386 1385 1387 1386 /* 1388 1387 * Take a first sample, leaving nPENIRQ active and vREF off; avoid 1389 1388 * the touchscreen, in case it's not connected. 1390 1389 */ 1391 1390 if (ts->model == 7845) 1392 - ads7845_read12_ser(&spi->dev, PWRDOWN); 1391 + ads7845_read12_ser(dev, PWRDOWN); 1393 1392 else 1394 - (void) ads7846_read12_ser(&spi->dev, READ_12BIT_SER(vaux)); 1393 + (void) ads7846_read12_ser(dev, READ_12BIT_SER(vaux)); 1395 1394 1396 - err = sysfs_create_group(&spi->dev.kobj, &ads784x_attr_group); 1395 + err = sysfs_create_group(&dev->kobj, &ads784x_attr_group); 1397 1396 if (err) 1398 1397 goto err_remove_hwmon; 1399 1398 ··· 1401 1400 if (err) 1402 1401 goto err_remove_attr_group; 1403 1402 1404 - device_init_wakeup(&spi->dev, pdata->wakeup); 1403 + device_init_wakeup(dev, pdata->wakeup); 1405 1404 1406 1405 /* 1407 1406 * If device does not carry platform data we must have allocated it 1408 1407 * when parsing DT data. 1409 1408 */ 1410 - if (!dev_get_platdata(&spi->dev)) 1411 - devm_kfree(&spi->dev, (void *)pdata); 1409 + if (!dev_get_platdata(dev)) 1410 + devm_kfree(dev, (void *)pdata); 1412 1411 1413 1412 return 0; 1414 1413 1415 1414 err_remove_attr_group: 1416 - sysfs_remove_group(&spi->dev.kobj, &ads784x_attr_group); 1415 + sysfs_remove_group(&dev->kobj, &ads784x_attr_group); 1417 1416 err_remove_hwmon: 1418 1417 ads784x_hwmon_unregister(spi, ts); 1419 1418 err_free_irq: