Merge tag 'at24-updates-for-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-mergewindow

wsakernel · wsakernel · commit 6fb605c41d73 · 2023-06-23T12:59:46.000+02:00
at24 updates for v6.5

- use dev_err_probe() where applicable
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
@@ -761,7 +761,8 @@ static int at24_probe(struct i2c_client *client)
 		pm_runtime_disable(dev);
 		if (!pm_runtime_status_suspended(dev))
 			regulator_disable(at24->vcc_reg);
-		return PTR_ERR(at24->nvmem);
+		return dev_err_probe(dev, PTR_ERR(at24->nvmem),
+				     "failed to register nvmem\n");
 	}
 
 	/*

Original file line number	Diff line number	Diff line change
`@@ -761,7 +761,8 @@ static int at24_probe(struct i2c_client *client)`
`761`	`761`	`pm_runtime_disable(dev);`
`762`	`762`	`if (!pm_runtime_status_suspended(dev))`
`763`	`763`	`regulator_disable(at24->vcc_reg);`
`764`		`- return PTR_ERR(at24->nvmem);`
	`764`	`+ return dev_err_probe(dev, PTR_ERR(at24->nvmem),`
	`765`	`+ "failed to register nvmem\n");`
`765`	`766`	`}`
`766`	`767`
`767`	`768`	`/*`