mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 11:23:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

greybus: i2c-gb: convert to use gb_operation_sync

Browse Source 
This converts the I2C protocol driver to use gb_operation_sync, removing
lots of places where the create/send/destroy pattern was being used to
send greybus messages.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
This commit is contained in:
Greg Kroah-Hartman
2014-11-23 17:45:23 -08:00
parent 7d5bbb1735
commit 5a8b8314db
1 changed files with 28 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,38 +92,23 @@ struct gb_i2c_transfer_response {
*/
static int gb_i2c_proto_version_operation(struct gb_i2c_device *gb_i2c_dev)
{
struct gb_connection *connection = gb_i2c_dev->connection;
struct gb_operation *operation;
struct gb_i2c_proto_version_response *response;
struct gb_i2c_proto_version_response response;
int ret;
/* A protocol version request has no payload */
operation = gb_operation_create(connection,
GB_I2C_TYPE_PROTOCOL_VERSION,
0, sizeof(*response));
if (!operation)
return -ENOMEM;
ret = gb_operation_sync(gb_i2c_dev->connection,
GB_I2C_TYPE_PROTOCOL_VERSION,
NULL, 0, &response, sizeof(response));
if (ret)
return ret;
/* Synchronous operation--no callback */
ret = gb_operation_request_send(operation, NULL);
if (ret) {
pr_err("version operation failed (%d)\n", ret);
goto out;
}
response = operation->response->payload;
if (response->major > GB_I2C_VERSION_MAJOR) {
if (response.major > GB_I2C_VERSION_MAJOR) {
pr_err("unsupported major version (%hhu > %hhu)\n",
response->major, GB_I2C_VERSION_MAJOR);
ret = -ENOTSUPP;
goto out;
response.major, GB_I2C_VERSION_MAJOR);
return -ENOTSUPP;
}
gb_i2c_dev->version_major = response->major;
gb_i2c_dev->version_minor = response->minor;
out:
gb_operation_destroy(operation);
return ret;
gb_i2c_dev->version_major = response.major;
gb_i2c_dev->version_minor = response.minor;
return 0;
}
/*
@@ -136,56 +121,34 @@ static u32 gb_i2c_functionality_map(u32 gb_i2c_functionality)
static int gb_i2c_functionality_operation(struct gb_i2c_device *gb_i2c_dev)
{
struct gb_connection *connection = gb_i2c_dev->connection;
struct gb_operation *operation;
struct gb_i2c_functionality_response *response;
struct gb_i2c_functionality_response response;
u32 functionality;
int ret;
/* A functionality request has no payload */
operation = gb_operation_create(connection,
GB_I2C_TYPE_FUNCTIONALITY,
0, sizeof(*response));
if (!operation)
return -ENOMEM;
ret = gb_operation_sync(gb_i2c_dev->connection,
GB_I2C_TYPE_FUNCTIONALITY,
NULL, 0, &response, sizeof(response));
if (ret)
return ret;
/* Synchronous operation--no callback */
ret = gb_operation_request_send(operation, NULL);
if (ret) {
pr_err("functionality operation failed (%d)\n", ret);
goto out;
}
response = operation->response->payload;
functionality = le32_to_cpu(response->functionality);
functionality = le32_to_cpu(response.functionality);
gb_i2c_dev->functionality = gb_i2c_functionality_map(functionality);
out:
gb_operation_destroy(operation);
return ret;
return 0;
}
static int gb_i2c_timeout_operation(struct gb_i2c_device *gb_i2c_dev, u16 msec)
{
struct gb_connection *connection = gb_i2c_dev->connection;
struct gb_operation *operation;
struct gb_i2c_timeout_request *request;
struct gb_i2c_timeout_request request;
int ret;
operation = gb_operation_create(connection, GB_I2C_TYPE_TIMEOUT,
sizeof(*request), 0);
if (!operation)
return -ENOMEM;
request = operation->request->payload;
request->msec = cpu_to_le16(msec);
/* Synchronous operation--no callback */
ret = gb_operation_request_send(operation, NULL);
request.msec = cpu_to_le16(msec);
ret = gb_operation_sync(gb_i2c_dev->connection, GB_I2C_TYPE_TIMEOUT,
&request, sizeof(request), NULL, 0);
if (ret)
pr_err("timeout operation failed (%d)\n", ret);
else
gb_i2c_dev->timeout_msec = msec;
gb_operation_destroy(operation);
return ret;
}
@@ -193,25 +156,16 @@ static int gb_i2c_timeout_operation(struct gb_i2c_device *gb_i2c_dev, u16 msec)
static int gb_i2c_retries_operation(struct gb_i2c_device *gb_i2c_dev,
u8 retries)
{
struct gb_connection *connection = gb_i2c_dev->connection;
struct gb_operation *operation;
struct gb_i2c_retries_request *request;
struct gb_i2c_retries_request request;
int ret;
operation = gb_operation_create(connection, GB_I2C_TYPE_RETRIES,
sizeof(*request), 0);
if (!operation)
return -ENOMEM;
request = operation->request->payload;
request->retries = retries;
/* Synchronous operation--no callback */
ret = gb_operation_request_send(operation, NULL);
request.retries = retries;
ret = gb_operation_sync(gb_i2c_dev->connection, GB_I2C_TYPE_RETRIES,
&request, sizeof(request), NULL, 0);
if (ret)
pr_err("retries operation failed (%d)\n", ret);
else
gb_i2c_dev->retries = retries;
gb_operation_destroy(operation);
return ret;
}