| From 1f245bbfc98c53d719825d43e93bf995c76876ff Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 3 May 2021 20:21:11 +0300 |
| Subject: staging: fbtft: Don't spam logs when probe is deferred |
| |
| From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| |
| [ Upstream commit 37667f6e57712cef5652fa67f1cbd1299e204d94 ] |
| |
| When requesting GPIO line the probe can be deferred. |
| In such case don't spam logs with an error message. |
| This can be achieved by switching to dev_err_probe(). |
| |
| Fixes: c440eee1a7a1 ("Staging: fbtft: Switch to the gpio descriptor interface") |
| Cc: Nishad Kamdar <nishadkamdar@gmail.com> |
| Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Link: https://lore.kernel.org/r/20210503172114.27891-3-andriy.shevchenko@linux.intel.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/staging/fbtft/fbtft-core.c | 12 ++++-------- |
| 1 file changed, 4 insertions(+), 8 deletions(-) |
| |
| diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c |
| index 67c3b1975a4d..3723269890d5 100644 |
| --- a/drivers/staging/fbtft/fbtft-core.c |
| +++ b/drivers/staging/fbtft/fbtft-core.c |
| @@ -75,20 +75,16 @@ static int fbtft_request_one_gpio(struct fbtft_par *par, |
| struct gpio_desc **gpiop) |
| { |
| struct device *dev = par->info->device; |
| - int ret = 0; |
| |
| *gpiop = devm_gpiod_get_index_optional(dev, name, index, |
| GPIOD_OUT_LOW); |
| - if (IS_ERR(*gpiop)) { |
| - ret = PTR_ERR(*gpiop); |
| - dev_err(dev, |
| - "Failed to request %s GPIO: %d\n", name, ret); |
| - return ret; |
| - } |
| + if (IS_ERR(*gpiop)) |
| + return dev_err_probe(dev, PTR_ERR(*gpiop), "Failed to request %s GPIO\n", name); |
| + |
| fbtft_par_dbg(DEBUG_REQUEST_GPIOS, par, "%s: '%s' GPIO\n", |
| __func__, name); |
| |
| - return ret; |
| + return 0; |
| } |
| |
| static int fbtft_request_gpios(struct fbtft_par *par) |
| -- |
| 2.30.2 |
| |