Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'regulator-fix-v6.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"A couple of fairly minor device specific fixes that came in over the
past week or so, plus the addition of an actual maintainer for the
IR38060"
* tag 'regulator-fix-v6.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: tps65219: regulator: tps65219: Fix error codes in probe()
regulator: pca9450: Use devm_register_sys_off_handler
regulator: dt-bindings: infineon,ir38060: Add Guenter as maintainer from IBM
+12
-15
+1
-1
Documentation/devicetree/bindings/regulator/infineon,ir38060.yaml
+1
-1
Documentation/devicetree/bindings/regulator/infineon,ir38060.yaml
+5
-8
drivers/regulator/pca9450-regulator.c
+5
-8
drivers/regulator/pca9450-regulator.c
···
40
40
struct device *dev;
41
41
struct regmap *regmap;
42
42
struct gpio_desc *sd_vsel_gpio;
43
-
struct notifier_block restart_nb;
44
43
enum pca9450_chip_type type;
45
44
unsigned int rcnt;
46
45
int irq;
···
1099
1100
return IRQ_HANDLED;
1100
1101
}
1101
1102
1102
-
static int pca9450_i2c_restart_handler(struct notifier_block *nb,
1103
-
unsigned long action, void *data)
1103
+
static int pca9450_i2c_restart_handler(struct sys_off_data *data)
1104
1104
{
1105
-
struct pca9450 *pca9450 = container_of(nb, struct pca9450, restart_nb);
1105
+
struct pca9450 *pca9450 = data->cb_data;
1106
1106
struct i2c_client *i2c = container_of(pca9450->dev, struct i2c_client, dev);
1107
1107
1108
1108
dev_dbg(&i2c->dev, "Restarting device..\n");
···
1259
1261
pca9450->sd_vsel_fixed_low =
1260
1262
of_property_read_bool(ldo5->dev.of_node, "nxp,sd-vsel-fixed-low");
1261
1263
1262
-
pca9450->restart_nb.notifier_call = pca9450_i2c_restart_handler;
1263
-
pca9450->restart_nb.priority = PCA9450_RESTART_HANDLER_PRIORITY;
1264
-
1265
-
if (register_restart_handler(&pca9450->restart_nb))
1264
+
if (devm_register_sys_off_handler(&i2c->dev, SYS_OFF_MODE_RESTART,
1265
+
PCA9450_RESTART_HANDLER_PRIORITY,
1266
+
pca9450_i2c_restart_handler, pca9450))
1266
1267
dev_warn(&i2c->dev, "Failed to register restart handler\n");
1267
1268
1268
1269
dev_info(&i2c->dev, "%s probed.\n",
+6
-6
drivers/regulator/tps65219-regulator.c
+6
-6
drivers/regulator/tps65219-regulator.c
···
454
454
irq_type->irq_name,
455
455
irq_data);
456
456
if (error)
457
-
return dev_err_probe(tps->dev, PTR_ERR(rdev),
458
-
"Failed to request %s IRQ %d: %d\n",
459
-
irq_type->irq_name, irq, error);
457
+
return dev_err_probe(tps->dev, error,
458
+
"Failed to request %s IRQ %d\n",
459
+
irq_type->irq_name, irq);
460
460
}
461
461
462
462
for (i = 0; i < pmic->dev_irq_size; ++i) {
···
477
477
irq_type->irq_name,
478
478
irq_data);
479
479
if (error)
480
-
return dev_err_probe(tps->dev, PTR_ERR(rdev),
481
-
"Failed to request %s IRQ %d: %d\n",
482
-
irq_type->irq_name, irq, error);
480
+
return dev_err_probe(tps->dev, error,
481
+
"Failed to request %s IRQ %d\n",
482
+
irq_type->irq_name, irq);
483
483
}
484
484
485
485
return 0;