| Message ID | 1548761153-28114-2-git-send-email-krzk@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [1/2] mfd: sec-core: Cleanup formatting to a consistent style | expand |
On Tue, 29 Jan 2019, Krzysztof Kozlowski wrote: > Replace impossible BUG() in probe with a proper return. This can be > triggered only in case of a clear bug (e.g. adding broken half-support > for new S2MPSXX flavor) but BUG() is discouraged and the boot process > can actually try to continue. > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > --- > drivers/mfd/sec-core.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Applied, thanks.
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c index c3bb53f79e63..2c2f48b24eeb 100644 --- a/drivers/mfd/sec-core.c +++ b/drivers/mfd/sec-core.c @@ -474,8 +474,9 @@ static int sec_pmic_probe(struct i2c_client *i2c, num_sec_devs = ARRAY_SIZE(s2mpu02_devs); break; default: - /* If this happens the probe function is problem */ - BUG(); + dev_err(&i2c->dev, "Unsupported device type (%lu)\n", + sec_pmic->device_type); + return -ENODEV; } ret = devm_mfd_add_devices(sec_pmic->dev, -1, sec_devs, num_sec_devs, NULL, 0, NULL);
Replace impossible BUG() in probe with a proper return. This can be triggered only in case of a clear bug (e.g. adding broken half-support for new S2MPSXX flavor) but BUG() is discouraged and the boot process can actually try to continue. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- drivers/mfd/sec-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)