[PATCH v2 3/5] staging: fbtft: fbtft_request_gpios: reduce nesting

[Mike Rapoport]

Returning immediately if no platform_data or platform_data->gpios is
specified reduceis code nesting

Signed-off-by: Mike Rapoport 
---
 drivers/staging/fbtft/fbtft-core.c | 51 +++---
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/drivers/staging/fbtft/fbtft-core.c 
b/drivers/staging/fbtft/fbtft-core.c
index 81ba416..f55936a 100644
--- a/drivers/staging/fbtft/fbtft-core.c
+++ b/drivers/staging/fbtft/fbtft-core.c
@@ -127,33 +127,34 @@ static int fbtft_request_gpios(struct fbtft_par *par)
unsigned long flags;
int ret;
 
-   if (pdata && pdata->gpios) {
-   gpio = pdata->gpios;
-   while (gpio->name[0]) {
-   flags = FBTFT_GPIO_NO_MATCH;
-   /* if driver provides match function, try it first,
-  if no match use our own */
-   if (par->fbtftops.request_gpios_match)
-   flags = par->fbtftops.request_gpios_match(par, 
gpio);
-   if (flags == FBTFT_GPIO_NO_MATCH)
-   flags = fbtft_request_gpios_match(par, gpio);
-   if (flags != FBTFT_GPIO_NO_MATCH) {
-   ret = devm_gpio_request_one(par->info->device,
-   gpio->gpio, flags,
-   
par->info->device->driver->name);
-   if (ret < 0) {
-   dev_err(par->info->device,
-   "%s: gpio_request_one('%s'=%d) 
failed with %d\n",
-   __func__, gpio->name,
-   gpio->gpio, ret);
-   return ret;
-   }
-   fbtft_par_dbg(DEBUG_REQUEST_GPIOS, par,
-   "%s: '%s' = GPIO%d\n",
-   __func__, gpio->name, gpio->gpio);
+   if (!(pdata && pdata->gpios))
+   return 0;
+
+   gpio = pdata->gpios;
+   while (gpio->name[0]) {
+   flags = FBTFT_GPIO_NO_MATCH;
+   /* if driver provides match function, try it first,
+  if no match use our own */
+   if (par->fbtftops.request_gpios_match)
+   flags = par->fbtftops.request_gpios_match(par, gpio);
+   if (flags == FBTFT_GPIO_NO_MATCH)
+   flags = fbtft_request_gpios_match(par, gpio);
+   if (flags != FBTFT_GPIO_NO_MATCH) {
+   ret = devm_gpio_request_one(par->info->device,
+   gpio->gpio, flags,
+   par->info->device->driver->name);
+   if (ret < 0) {
+   dev_err(par->info->device,
+   "%s: gpio_request_one('%s'=%d) failed 
with %d\n",
+   __func__, gpio->name,
+   gpio->gpio, ret);
+   return ret;
}
-   gpio++;
+   fbtft_par_dbg(DEBUG_REQUEST_GPIOS, par,
+   "%s: '%s' = GPIO%d\n",
+   __func__, gpio->name, gpio->gpio);
}
+   gpio++;
}
 
return 0;
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2 3/5] staging: fbtft: fbtft_request_gpios: reduce nesting

[Mike Rapoport]

Returning immediately if no platform_data or platform_data->gpios is
specified reduceis code nesting

Signed-off-by: Mike Rapoport 
---
 drivers/staging/fbtft/fbtft-core.c | 51 +++---
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/drivers/staging/fbtft/fbtft-core.c 
b/drivers/staging/fbtft/fbtft-core.c
index 81ba416..f55936a 100644
--- a/drivers/staging/fbtft/fbtft-core.c
+++ b/drivers/staging/fbtft/fbtft-core.c
@@ -127,33 +127,34 @@ static int fbtft_request_gpios(struct fbtft_par *par)
unsigned long flags;
int ret;
 
-   if (pdata && pdata->gpios) {
-   gpio = pdata->gpios;
-   while (gpio->name[0]) {
-   flags = FBTFT_GPIO_NO_MATCH;
-   /* if driver provides match function, try it first,
-  if no match use our own */
-   if (par->fbtftops.request_gpios_match)
-   flags = par->fbtftops.request_gpios_match(par, 
gpio);
-   if (flags == FBTFT_GPIO_NO_MATCH)
-   flags = fbtft_request_gpios_match(par, gpio);
-   if (flags != FBTFT_GPIO_NO_MATCH) {
-   ret = devm_gpio_request_one(par->info->device,
-   gpio->gpio, flags,
-   
par->info->device->driver->name);
-   if (ret < 0) {
-   dev_err(par->info->device,
-   "%s: gpio_request_one('%s'=%d) 
failed with %d\n",
-   __func__, gpio->name,
-   gpio->gpio, ret);
-   return ret;
-   }
-   fbtft_par_dbg(DEBUG_REQUEST_GPIOS, par,
-   "%s: '%s' = GPIO%d\n",
-   __func__, gpio->name, gpio->gpio);
+   if (!(pdata && pdata->gpios))
+   return 0;
+
+   gpio = pdata->gpios;
+   while (gpio->name[0]) {
+   flags = FBTFT_GPIO_NO_MATCH;
+   /* if driver provides match function, try it first,
+  if no match use our own */
+   if (par->fbtftops.request_gpios_match)
+   flags = par->fbtftops.request_gpios_match(par, gpio);
+   if (flags == FBTFT_GPIO_NO_MATCH)
+   flags = fbtft_request_gpios_match(par, gpio);
+   if (flags != FBTFT_GPIO_NO_MATCH) {
+   ret = devm_gpio_request_one(par->info->device,
+   gpio->gpio, flags,
+   par->info->device->driver->name);
+   if (ret < 0) {
+   dev_err(par->info->device,
+   "%s: gpio_request_one('%s'=%d) failed 
with %d\n",
+   __func__, gpio->name,
+   gpio->gpio, ret);
+   return ret;
}
-   gpio++;
+   fbtft_par_dbg(DEBUG_REQUEST_GPIOS, par,
+   "%s: '%s' = GPIO%d\n",
+   __func__, gpio->name, gpio->gpio);
}
+   gpio++;
}
 
return 0;
-- 
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/