Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'regulator-fix-v7.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"A couple of small driver specific fixes for pca9450, cleaning up
logging and fixing warnings due to confusion with interrupt type"
* tag 'regulator-fix-v7.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: pca9450: Correct probed name for PCA9452
regulator: pca9450: Correct interrupt type
+10
-4
+10
-4
drivers/regulator/pca9450-regulator.c
+10
-4
drivers/regulator/pca9450-regulator.c
···
1293
1293
struct regulator_dev *ldo5;
1294
1294
struct pca9450 *pca9450;
1295
1295
unsigned int device_id, i;
1296
+
const char *type_name;
1296
1297
int ret;
1297
1298
1298
1299
pca9450 = devm_kzalloc(&i2c->dev, sizeof(struct pca9450), GFP_KERNEL);
···
1304
1303
case PCA9450_TYPE_PCA9450A:
1305
1304
regulator_desc = pca9450a_regulators;
1306
1305
pca9450->rcnt = ARRAY_SIZE(pca9450a_regulators);
1306
+
type_name = "pca9450a";
1307
1307
break;
1308
1308
case PCA9450_TYPE_PCA9450BC:
1309
1309
regulator_desc = pca9450bc_regulators;
1310
1310
pca9450->rcnt = ARRAY_SIZE(pca9450bc_regulators);
1311
+
type_name = "pca9450bc";
1311
1312
break;
1312
1313
case PCA9450_TYPE_PCA9451A:
1314
+
regulator_desc = pca9451a_regulators;
1315
+
pca9450->rcnt = ARRAY_SIZE(pca9451a_regulators);
1316
+
type_name = "pca9451a";
1317
+
break;
1313
1318
case PCA9450_TYPE_PCA9452:
1314
1319
regulator_desc = pca9451a_regulators;
1315
1320
pca9450->rcnt = ARRAY_SIZE(pca9451a_regulators);
1321
+
type_name = "pca9452";
1316
1322
break;
1317
1323
default:
1318
1324
dev_err(&i2c->dev, "Unknown device type");
···
1377
1369
if (pca9450->irq) {
1378
1370
ret = devm_request_threaded_irq(pca9450->dev, pca9450->irq, NULL,
1379
1371
pca9450_irq_handler,
1380
-
(IRQF_TRIGGER_FALLING | IRQF_ONESHOT),
1372
+
(IRQF_TRIGGER_LOW | IRQF_ONESHOT),
1381
1373
"pca9450-irq", pca9450);
1382
1374
if (ret != 0)
1383
1375
return dev_err_probe(pca9450->dev, ret, "Failed to request IRQ: %d\n",
···
1421
1413
pca9450_i2c_restart_handler, pca9450))
1422
1414
dev_warn(&i2c->dev, "Failed to register restart handler\n");
1423
1415
1424
-
dev_info(&i2c->dev, "%s probed.\n",
1425
-
type == PCA9450_TYPE_PCA9450A ? "pca9450a" :
1426
-
(type == PCA9450_TYPE_PCA9451A ? "pca9451a" : "pca9450bc"));
1416
+
dev_info(&i2c->dev, "%s probed.\n", type_name);
1427
1417
1428
1418
return 0;
1429
1419
}