Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ec30632 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

greybus: convert drivers to use connection->private set/get 



This converts all drivers to use the gb_connection_get_data() and
gb_connection_set_data() functions to make it a bit more explicit as to
what is going on.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Reviewed-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 418f3dab

drivers/staging/greybus/audio_codec.c

+2 −2
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ static int gb_audio_add_mgmt_connection(struct gbaudio_codec_info *gbcodec, 
	if (IS_ERR(connection))

		return PTR_ERR(connection);



	connection->private = gbcodec;

	gb_connection_set_data(connection, gbcodec);

	gbcodec->mgmt_connection = connection;



	return 0;
@@ -703,7 +703,7 @@ static int gb_audio_add_data_connection(struct gbaudio_codec_info *gbcodec, 
		return PTR_ERR(connection);

	}



	connection->private = gbcodec;

	gb_connection_set_data(connection, gbcodec);

	atomic_set(&dai->users, 0);

	init_waitqueue_head(&dai->wait_queue);

	dai->data_cport = connection->intf_cport_id;

drivers/staging/greybus/camera.c

+3 −3
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static int gb_camera_flush(struct gb_camera *gcam, u32 *request_id) 


static int gb_camera_event_recv(u8 type, struct gb_operation *op)

{

	struct gb_camera *gcam = op->connection->private;

	struct gb_camera *gcam = gb_connection_get_data(op->connection);

	struct gb_camera_metadata_request *payload;

	struct gb_message *request;
@@ -904,7 +904,7 @@ static int gb_camera_connection_init(struct gb_connection *connection) 
		return -ENOMEM;



	gcam->connection = connection;

	connection->private = gcam;

	gb_connection_set_data(connection, gcam);



	/*

	 * Create the data connection between camera module CDSI0 and APB CDS1.
@@ -936,7 +936,7 @@ static int gb_camera_connection_init(struct gb_connection *connection) 


static void gb_camera_connection_exit(struct gb_connection *connection)

{

	struct gb_camera *gcam = connection->private;

	struct gb_camera *gcam = gb_connection_get_data(connection);



	gb_camera_unregister_intf_ops(gcam);

drivers/staging/greybus/control.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ struct gb_control *gb_control_create(struct gb_interface *intf) 
		return NULL;

	}



	control->connection->private = control;

	gb_connection_set_data(control->connection, control);



	return control;

}

drivers/staging/greybus/firmware.c

+5 −7
Original line number Diff line number Diff line
@@ -115,11 +115,10 @@ static int download_firmware(struct gb_firmware *firmware, u8 stage) 


static int gb_firmware_size_request(struct gb_operation *op)

{

	struct gb_connection *connection = op->connection;

	struct gb_firmware *firmware = connection->private;

	struct gb_firmware *firmware = gb_connection_get_data(op->connection);

	struct gb_firmware_size_request *size_request = op->request->payload;

	struct gb_firmware_size_response *size_response;

	struct device *dev = &connection->bundle->dev;

	struct device *dev = &op->connection->bundle->dev;

	int ret;



	if (op->request->payload_size != sizeof(*size_request)) {
@@ -153,12 +152,11 @@ static int gb_firmware_size_request(struct gb_operation *op) 


static int gb_firmware_get_firmware(struct gb_operation *op)

{

	struct gb_connection *connection = op->connection;

	struct gb_firmware *firmware = connection->private;

	struct gb_firmware *firmware = gb_connection_get_data(op->connection);

	const struct firmware *fw = firmware->fw;

	struct gb_firmware_get_firmware_request *firmware_request;

	struct gb_firmware_get_firmware_response *firmware_response;

	struct device *dev = &connection->bundle->dev;

	struct device *dev = &op->connection->bundle->dev;

	unsigned int offset, size;



	if (op->request->payload_size != sizeof(*firmware_request)) {
@@ -309,7 +307,7 @@ static int gb_firmware_probe(struct gb_bundle *bundle, 
		goto err_free_firmware;

	}



	connection->private = firmware;

	gb_connection_set_data(connection, firmware);



	firmware->connection = connection;

drivers/staging/greybus/gpio.c

+3 −3
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static int gb_gpio_request_recv(u8 type, struct gb_operation *op) 
{

	struct gb_connection *connection = op->connection;

	struct device *dev = &connection->bundle->dev;

	struct gb_gpio_controller *ggc = connection->private;

	struct gb_gpio_controller *ggc = gb_connection_get_data(connection);

	struct gb_message *request;

	struct gb_gpio_irq_event_request *event;

	int irq;
@@ -633,7 +633,7 @@ static int gb_gpio_connection_init(struct gb_connection *connection) 
	if (!ggc)

		return -ENOMEM;

	ggc->connection = connection;

	connection->private = ggc;

	gb_connection_set_data(connection, ggc);



	ret = gb_gpio_controller_setup(ggc);

	if (ret)
@@ -700,7 +700,7 @@ static int gb_gpio_connection_init(struct gb_connection *connection) 


static void gb_gpio_connection_exit(struct gb_connection *connection)

{

	struct gb_gpio_controller *ggc = connection->private;

	struct gb_gpio_controller *ggc = gb_connection_get_data(connection);



	if (!ggc)

		return;