Patchwork [U-Boot,v2,3/4] imx: Use GPIO_TO_PORT macro in the gpio driver instead of (gpio >> 5)

login
register
mail settings
Submitter Vikram Narayanan
Date April 10, 2012, 2:26 p.m.
Message ID <4F84430C.7060204@gmail.com>
Download mbox | patch
Permalink /patch/151586/
State Awaiting Upstream
Headers show

Comments

Vikram Narayanan - April 10, 2012, 2:26 p.m.
Use the defined GPIO_TO_PORT macro. Remove gpio >> 5 references.

Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
---
 drivers/gpio/mxc_gpio.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Stefano Babic - April 10, 2012, 2:44 p.m.
On 10/04/2012 16:26, Vikram Narayanan wrote:
> Use the defined GPIO_TO_PORT macro. Remove gpio >> 5 references.
> 
> Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
> ---
>  drivers/gpio/mxc_gpio.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
> index 7e65b39..21b1cdc 100644
> --- a/drivers/gpio/mxc_gpio.c
> +++ b/drivers/gpio/mxc_gpio.c
> @@ -54,7 +54,7 @@ static unsigned long gpio_ports[] = {
>  static int mxc_gpio_direction(unsigned int gpio,
>  	enum mxc_gpio_direction direction)
>  {
> -	unsigned int port = gpio >> 5;
> +	unsigned int port = GPIO_TO_PORT(gpio);
>  	struct gpio_regs *regs;
>  	u32 l;
>  
> @@ -81,7 +81,7 @@ static int mxc_gpio_direction(unsigned int gpio,
>  
>  int gpio_set_value(unsigned gpio, int value)
>  {
> -	unsigned int port = gpio >> 5;
> +	unsigned int port = GPIO_TO_PORT(gpio);
>  	struct gpio_regs *regs;
>  	u32 l;
>  
> @@ -104,7 +104,7 @@ int gpio_set_value(unsigned gpio, int value)
>  
>  int gpio_get_value(unsigned gpio)
>  {
> -	unsigned int port = gpio >> 5;
> +	unsigned int port = GPIO_TO_PORT(gpio);
>  	struct gpio_regs *regs;
>  	u32 val;
>  
> @@ -122,7 +122,7 @@ int gpio_get_value(unsigned gpio)
>  
>  int gpio_request(unsigned gpio, const char *label)
>  {
> -	unsigned int port = gpio >> 5;
> +	unsigned int port = GPIO_TO_PORT(gpio);
>  	if (port >= ARRAY_SIZE(gpio_ports))
>  		return -1;
>  	return 0;

Acked-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic
Stefano Babic - April 11, 2012, 7:33 a.m.
On 10/04/2012 16:26, Vikram Narayanan wrote:
> Use the defined GPIO_TO_PORT macro. Remove gpio >> 5 references.
> 
> Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
> ---

Applied to u-boot-imx (fix), thanks.

Best regards,
Stefano Babic

Patch

diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index 7e65b39..21b1cdc 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -54,7 +54,7 @@  static unsigned long gpio_ports[] = {
 static int mxc_gpio_direction(unsigned int gpio,
 	enum mxc_gpio_direction direction)
 {
-	unsigned int port = gpio >> 5;
+	unsigned int port = GPIO_TO_PORT(gpio);
 	struct gpio_regs *regs;
 	u32 l;
 
@@ -81,7 +81,7 @@  static int mxc_gpio_direction(unsigned int gpio,
 
 int gpio_set_value(unsigned gpio, int value)
 {
-	unsigned int port = gpio >> 5;
+	unsigned int port = GPIO_TO_PORT(gpio);
 	struct gpio_regs *regs;
 	u32 l;
 
@@ -104,7 +104,7 @@  int gpio_set_value(unsigned gpio, int value)
 
 int gpio_get_value(unsigned gpio)
 {
-	unsigned int port = gpio >> 5;
+	unsigned int port = GPIO_TO_PORT(gpio);
 	struct gpio_regs *regs;
 	u32 val;
 
@@ -122,7 +122,7 @@  int gpio_get_value(unsigned gpio)
 
 int gpio_request(unsigned gpio, const char *label)
 {
-	unsigned int port = gpio >> 5;
+	unsigned int port = GPIO_TO_PORT(gpio);
 	if (port >= ARRAY_SIZE(gpio_ports))
 		return -1;
 	return 0;