iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

greybus: set up connection->private properly

Browse Source 
The connection->private pointer should refer to a protocol-specific
data structure.  Change two protocol drivers (USB and vibrator) so
they now set this.

In addition, because the setup routine may need access to the
data structure, the private pointer should be set early--as
early as possible.  Make the UART, i2c, and GPIO protocol drivers
set the private pointer earlier.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
This commit is contained in:
Alex Elder 2014-12-03 12:27:42 -06:00 committed by Greg Kroah-Hartman
parent 62749a056a
commit 93bbe859b7
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/greybus/gpio-gb.c
View File

@ -472,6 +472,7 @@ static int gb_gpio_connection_init(struct gb_connection *connection)
if (!gb_gpio_controller)
return -ENOMEM;
gb_gpio_controller->connection = connection;
connection->private = gb_gpio_controller;
ret = gb_gpio_controller_setup(gb_gpio_controller);
if (ret)
@ -502,7 +503,6 @@ static int gb_gpio_connection_init(struct gb_connection *connection)
pr_err("Failed to register GPIO\n");
return ret;
}
connection->private = gb_gpio_controller;
return 0;
out_err:

3
drivers/staging/greybus/i2c-gb.c
View File

@ -377,6 +377,7 @@ static int gb_i2c_connection_init(struct gb_connection *connection)
return -ENOMEM;
gb_i2c_dev->connection = connection; /* refcount? */
connection->private = gb_i2c_dev;
ret = gb_i2c_device_setup(gb_i2c_dev);
if (ret)
@ -399,8 +400,6 @@ static int gb_i2c_connection_init(struct gb_connection *connection)
if (ret)
goto out_err;
connection->private = gb_i2c_dev;
return 0;
out_err:
/* kref_put(gb_i2c_dev->connection) */

2
drivers/staging/greybus/pwm-gb.c
View File

@ -266,6 +266,7 @@ static int gb_pwm_connection_init(struct gb_connection *connection)
if (!pwmc)
return -ENOMEM;
pwmc->connection = connection;
connection->private = pwmc;
/* Check for compatible protocol version */
ret = gb_pwm_proto_version_operation(pwmc);
@ -290,7 +291,6 @@ static int gb_pwm_connection_init(struct gb_connection *connection)
pr_err("Failed to register PWM\n");
return ret;
}
connection->private = pwmc;
return 0;
out_err:

3
drivers/staging/greybus/uart-gb.c
View File

@ -637,6 +637,7 @@ static int gb_uart_connection_init(struct gb_connection *connection)
if (!gb_tty)
return -ENOMEM;
gb_tty->connection = connection;
connection->private = gb_tty;
/* Check for compatible protocol version */
retval = get_version(gb_tty);
@ -659,8 +660,6 @@ static int gb_uart_connection_init(struct gb_connection *connection)
init_waitqueue_head(&gb_tty->wioctl);
mutex_init(&gb_tty->mutex);
connection->private = gb_tty;
send_control(gb_tty, gb_tty->ctrlout);
/* initialize the uart to be 9600n81 */

1
drivers/staging/greybus/usb-gb.c
View File

@ -341,6 +341,7 @@ static int gb_usb_connection_init(struct gb_connection *connection)
return -ENOMEM;
gb_usb_dev->connection = connection;
connection->private = gb_usb_dev;
/* Check for compatible protocol version */
retval = get_version(gb_usb_dev);

1
drivers/staging/greybus/vibrator-gb.c
View File

@ -139,6 +139,7 @@ static int gb_vibrator_connection_init(struct gb_connection *connection)
return -ENOMEM;
vib->connection = connection;
connection->private = vib;
retval = get_version(vib);
if (retval)