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

siox: Simplify error handling via dev_err_probe()

commit a787e5400a1c ("driver core: add device probe log helper")
introduced a helper for a common error checking pattern. Use it.

Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thorsten Scherer <t.scherer@eckelmann.de>
Link: https://lore.kernel.org/r/20210616061736.3786173-2-t.scherer@eckelmann.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Thorsten Scherer and committed by
Greg Kroah-Hartman
75020f2d 1e2658ae

+10 -9
+10 -9
drivers/siox/siox-bus-gpio.c
··· 102 102 103 103 ddata->din = devm_gpiod_get(dev, "din", GPIOD_IN); 104 104 if (IS_ERR(ddata->din)) { 105 - ret = PTR_ERR(ddata->din); 106 - dev_err(dev, "Failed to get %s GPIO: %d\n", "din", ret); 105 + ret = dev_err_probe(dev, PTR_ERR(ddata->din), 106 + "Failed to get din GPIO\n"); 107 107 goto err; 108 108 } 109 109 110 110 ddata->dout = devm_gpiod_get(dev, "dout", GPIOD_OUT_LOW); 111 111 if (IS_ERR(ddata->dout)) { 112 - ret = PTR_ERR(ddata->dout); 113 - dev_err(dev, "Failed to get %s GPIO: %d\n", "dout", ret); 112 + ret = dev_err_probe(dev, PTR_ERR(ddata->dout), 113 + "Failed to get dout GPIO\n"); 114 114 goto err; 115 115 } 116 116 117 117 ddata->dclk = devm_gpiod_get(dev, "dclk", GPIOD_OUT_LOW); 118 118 if (IS_ERR(ddata->dclk)) { 119 - ret = PTR_ERR(ddata->dclk); 120 - dev_err(dev, "Failed to get %s GPIO: %d\n", "dclk", ret); 119 + ret = dev_err_probe(dev, PTR_ERR(ddata->dclk), 120 + "Failed to get dclk GPIO\n"); 121 121 goto err; 122 122 } 123 123 124 124 ddata->dld = devm_gpiod_get(dev, "dld", GPIOD_OUT_LOW); 125 125 if (IS_ERR(ddata->dld)) { 126 - ret = PTR_ERR(ddata->dld); 127 - dev_err(dev, "Failed to get %s GPIO: %d\n", "dld", ret); 126 + ret = dev_err_probe(dev, PTR_ERR(ddata->dld), 127 + "Failed to get dld GPIO\n"); 128 128 goto err; 129 129 } 130 130 ··· 134 134 135 135 ret = siox_master_register(smaster); 136 136 if (ret) { 137 - dev_err(dev, "Failed to register siox master: %d\n", ret); 137 + dev_err_probe(dev, ret, 138 + "Failed to register siox master\n"); 138 139 err: 139 140 siox_master_put(smaster); 140 141 }