Skip to content

L
linux
Commit 8aff1ace authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files
Options

greybus: gpio: make gb_gpio_controller pointer naming consistent 

Rename all struct gb_gpio_controller-pointer variables "ggc" for
consistency and readability reason.

This also fixes a bunch of lines that exceeded the 80 columns limit.
Signed-off-by: default avatarJohan Hovold <johan@hovoldconsulting.com>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent bda7e2d1
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 43 deletions
drivers/staging/greybus/gpio.c
View file @ 8aff1ace
...@@ -412,10 +412,10 @@ static void gb_gpio_request_recv(u8 type, struct gb_operation *op) ...@@ -412,10 +412,10 @@ static void gb_gpio_request_recv(u8 type, struct gb_operation *op)
static int gb_gpio_request(struct gpio_chip *chip, unsigned offset) static int gb_gpio_request(struct gpio_chip *chip, unsigned offset)
{ {
struct gb_gpio_controller *gb_gpio_controller = gpio_chip_to_gb_gpio_controller(chip); struct gb_gpio_controller *ggc = gpio_chip_to_gb_gpio_controller(chip);
int ret; int ret;
ret = gb_gpio_activate_operation(gb_gpio_controller, (u8)offset); ret = gb_gpio_activate_operation(ggc, (u8)offset);
if (ret) if (ret)
; /* return ret; */ ; /* return ret; */
return 0; return 0;
...@@ -423,33 +423,33 @@ static int gb_gpio_request(struct gpio_chip *chip, unsigned offset) ...@@ -423,33 +423,33 @@ static int gb_gpio_request(struct gpio_chip *chip, unsigned offset)
static void gb_gpio_free(struct gpio_chip *chip, unsigned offset) static void gb_gpio_free(struct gpio_chip *chip, unsigned offset)
{ {
struct gb_gpio_controller *gb_gpio_controller = gpio_chip_to_gb_gpio_controller(chip); struct gb_gpio_controller *ggc = gpio_chip_to_gb_gpio_controller(chip);
int ret; int ret;
ret = gb_gpio_deactivate_operation(gb_gpio_controller, (u8)offset); ret = gb_gpio_deactivate_operation(ggc, (u8)offset);
if (ret) if (ret)
; /* return ret; */ ; /* return ret; */
} }
static int gb_gpio_get_direction(struct gpio_chip *chip, unsigned offset) static int gb_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
{ {
struct gb_gpio_controller *gb_gpio_controller = gpio_chip_to_gb_gpio_controller(chip); struct gb_gpio_controller *ggc = gpio_chip_to_gb_gpio_controller(chip);
u8 which; u8 which;
int ret; int ret;
which = (u8)offset; which = (u8)offset;
ret = gb_gpio_get_direction_operation(gb_gpio_controller, which); ret = gb_gpio_get_direction_operation(ggc, which);
if (ret) if (ret)
; /* return ret; */ ; /* return ret; */
return gb_gpio_controller->lines[which].direction ? 1 : 0; return ggc->lines[which].direction ? 1 : 0;
} }
static int gb_gpio_direction_input(struct gpio_chip *chip, unsigned offset) static int gb_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
{ {
struct gb_gpio_controller *gb_gpio_controller = gpio_chip_to_gb_gpio_controller(chip); struct gb_gpio_controller *ggc = gpio_chip_to_gb_gpio_controller(chip);
int ret; int ret;
ret = gb_gpio_direction_in_operation(gb_gpio_controller, (u8)offset); ret = gb_gpio_direction_in_operation(ggc, (u8)offset);
if (ret) if (ret)
; /* return ret; */ ; /* return ret; */
return 0; return 0;
...@@ -458,10 +458,10 @@ static int gb_gpio_direction_input(struct gpio_chip *chip, unsigned offset) ...@@ -458,10 +458,10 @@ static int gb_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
static int gb_gpio_direction_output(struct gpio_chip *chip, unsigned offset, static int gb_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
int value) int value)
{ {
struct gb_gpio_controller *gb_gpio_controller = gpio_chip_to_gb_gpio_controller(chip); struct gb_gpio_controller *ggc = gpio_chip_to_gb_gpio_controller(chip);
int ret; int ret;
ret = gb_gpio_direction_out_operation(gb_gpio_controller, (u8)offset, !!value); ret = gb_gpio_direction_out_operation(ggc, (u8)offset, !!value);
if (ret) if (ret)
; /* return ret; */ ; /* return ret; */
return 0; return 0;
...@@ -469,23 +469,23 @@ static int gb_gpio_direction_output(struct gpio_chip *chip, unsigned offset, ...@@ -469,23 +469,23 @@ static int gb_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
static int gb_gpio_get(struct gpio_chip *chip, unsigned offset) static int gb_gpio_get(struct gpio_chip *chip, unsigned offset)
{ {
struct gb_gpio_controller *gb_gpio_controller = gpio_chip_to_gb_gpio_controller(chip); struct gb_gpio_controller *ggc = gpio_chip_to_gb_gpio_controller(chip);
u8 which; u8 which;
int ret; int ret;
which = (u8)offset; which = (u8)offset;
ret = gb_gpio_get_value_operation(gb_gpio_controller, which); ret = gb_gpio_get_value_operation(ggc, which);
if (ret) if (ret)
return ret; return ret;
return gb_gpio_controller->lines[which].value; return ggc->lines[which].value;
} }
static void gb_gpio_set(struct gpio_chip *chip, unsigned offset, int value) static void gb_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
{ {
struct gb_gpio_controller *gb_gpio_controller = gpio_chip_to_gb_gpio_controller(chip); struct gb_gpio_controller *ggc = gpio_chip_to_gb_gpio_controller(chip);
int ret; int ret;
ret = gb_gpio_set_value_operation(gb_gpio_controller, (u8)offset, !!value); ret = gb_gpio_set_value_operation(ggc, (u8)offset, !!value);
if (ret) if (ret)
; /* return ret; */ ; /* return ret; */
} }
...@@ -493,14 +493,14 @@ static void gb_gpio_set(struct gpio_chip *chip, unsigned offset, int value) ...@@ -493,14 +493,14 @@ static void gb_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
static int gb_gpio_set_debounce(struct gpio_chip *chip, unsigned offset, static int gb_gpio_set_debounce(struct gpio_chip *chip, unsigned offset,
unsigned debounce) unsigned debounce)
{ {
struct gb_gpio_controller *gb_gpio_controller = gpio_chip_to_gb_gpio_controller(chip); struct gb_gpio_controller *ggc = gpio_chip_to_gb_gpio_controller(chip);
u16 usec; u16 usec;
int ret; int ret;
if (debounce > U16_MAX) if (debounce > U16_MAX)
return -EINVAL; return -EINVAL;
usec = (u16)debounce; usec = (u16)debounce;
ret = gb_gpio_set_debounce_operation(gb_gpio_controller, (u8)offset, usec); ret = gb_gpio_set_debounce_operation(ggc, (u8)offset, usec);
if (ret) if (ret)
; /* return ret; */ ; /* return ret; */
...@@ -512,25 +512,25 @@ static void gb_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) ...@@ -512,25 +512,25 @@ static void gb_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
return; /* XXX */ return; /* XXX */
} }
static int gb_gpio_controller_setup(struct gb_gpio_controller *gb_gpio_controller) static int gb_gpio_controller_setup(struct gb_gpio_controller *ggc)
{ {
u32 line_count; u32 line_count;
size_t size; size_t size;
int ret; int ret;
/* First thing we need to do is check the version */ /* First thing we need to do is check the version */
ret = get_version(gb_gpio_controller); ret = get_version(ggc);
if (ret) if (ret)
; /* return ret; */ ; /* return ret; */
/* Now find out how many lines there are */ /* Now find out how many lines there are */
ret = gb_gpio_line_count_operation(gb_gpio_controller); ret = gb_gpio_line_count_operation(ggc);
if (ret) if (ret)
; /* return ret; */ ; /* return ret; */
line_count = (u32)gb_gpio_controller->line_max + 1; line_count = (u32)ggc->line_max + 1;
size = line_count * sizeof(*gb_gpio_controller->lines); size = line_count * sizeof(*ggc->lines);
gb_gpio_controller->lines = kzalloc(size, GFP_KERNEL); ggc->lines = kzalloc(size, GFP_KERNEL);
if (!gb_gpio_controller->lines) if (!ggc->lines)
return -ENOMEM; return -ENOMEM;
return ret; return ret;
...@@ -675,29 +675,29 @@ static int gb_gpio_to_irq(struct gpio_chip *chip, unsigned offset) ...@@ -675,29 +675,29 @@ static int gb_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
static int gb_gpio_connection_init(struct gb_connection *connection) static int gb_gpio_connection_init(struct gb_connection *connection)
{ {
struct gb_gpio_controller *gb_gpio_controller; struct gb_gpio_controller *ggc;
struct gpio_chip *gpio; struct gpio_chip *gpio;
struct irq_chip *irqc; struct irq_chip *irqc;
int ret; int ret;
gb_gpio_controller = kzalloc(sizeof(*gb_gpio_controller), GFP_KERNEL); ggc = kzalloc(sizeof(*ggc), GFP_KERNEL);
if (!gb_gpio_controller) if (!ggc)
return -ENOMEM; return -ENOMEM;
gb_gpio_controller->connection = connection; ggc->connection = connection;
connection->private = gb_gpio_controller; connection->private = ggc;
ret = gb_gpio_controller_setup(gb_gpio_controller); ret = gb_gpio_controller_setup(ggc);
if (ret) if (ret)
goto err_free_controller; goto err_free_controller;
irqc = &gb_gpio_controller->irqc; irqc = &ggc->irqc;
irqc->irq_ack = gb_gpio_ack_irq; irqc->irq_ack = gb_gpio_ack_irq;
irqc->irq_mask = gb_gpio_mask_irq; irqc->irq_mask = gb_gpio_mask_irq;
irqc->irq_unmask = gb_gpio_unmask_irq; irqc->irq_unmask = gb_gpio_unmask_irq;
irqc->irq_set_type = gb_gpio_irq_set_type; irqc->irq_set_type = gb_gpio_irq_set_type;
irqc->name = "greybus_gpio"; irqc->name = "greybus_gpio";
gpio = &gb_gpio_controller->chip; gpio = &ggc->chip;
gpio->label = "greybus_gpio"; gpio->label = "greybus_gpio";
gpio->dev = &connection->dev; gpio->dev = &connection->dev;
...@@ -714,7 +714,7 @@ static int gb_gpio_connection_init(struct gb_connection *connection) ...@@ -714,7 +714,7 @@ static int gb_gpio_connection_init(struct gb_connection *connection)
gpio->dbg_show = gb_gpio_dbg_show; gpio->dbg_show = gb_gpio_dbg_show;
gpio->to_irq = gb_gpio_to_irq; gpio->to_irq = gb_gpio_to_irq;
gpio->base = -1; /* Allocate base dynamically */ gpio->base = -1; /* Allocate base dynamically */
gpio->ngpio = gb_gpio_controller->line_max + 1; gpio->ngpio = ggc->line_max + 1;
gpio->can_sleep = true; gpio->can_sleep = true;
ret = gpiochip_add(gpio); ret = gpiochip_add(gpio);
...@@ -735,24 +735,24 @@ static int gb_gpio_connection_init(struct gb_connection *connection) ...@@ -735,24 +735,24 @@ static int gb_gpio_connection_init(struct gb_connection *connection)
irqchip_err: irqchip_err:
gb_gpiochip_remove(gpio); gb_gpiochip_remove(gpio);
err_free_lines: err_free_lines:
kfree(gb_gpio_controller->lines); kfree(ggc->lines);
err_free_controller: err_free_controller:
kfree(gb_gpio_controller); kfree(ggc);
return ret; return ret;
} }
static void gb_gpio_connection_exit(struct gb_connection *connection) static void gb_gpio_connection_exit(struct gb_connection *connection)
{ {
struct gb_gpio_controller *gb_gpio_controller = connection->private; struct gb_gpio_controller *ggc = connection->private;
if (!gb_gpio_controller) if (!ggc)
return; return;
gb_gpio_irqchip_remove(gb_gpio_controller); gb_gpio_irqchip_remove(ggc);
gb_gpiochip_remove(&gb_gpio_controller->chip); gb_gpiochip_remove(&ggc->chip);
/* kref_put(gb_gpio_controller->connection) */ /* kref_put(ggc->connection) */
kfree(gb_gpio_controller->lines); kfree(ggc->lines);
kfree(gb_gpio_controller); kfree(ggc);
} }
static struct gb_protocol gpio_protocol = { static struct gb_protocol gpio_protocol = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7