From c9db2df3b8662aab59b25e2e84e6f73999dfc5f7 Mon Sep 17 00:00:00 2001 From: Murali Nalajala Date: Tue, 10 Jul 2018 15:36:07 -0700 Subject: [PATCH] vservices: Fix LLVM compilation errors for vservice drivers vServices drivers compilation failed when it is compiled with LLVM compiler. Fix the vService drivers to compile successfully. Change-Id: Ie729480eb17c3156c63638edb4e47603cfad1ef2 Signed-off-by: Murali Nalajala Signed-off-by: Prakruthi Deepak Heragu --- drivers/vservices/protocol/block/client.c | 10 +++++----- drivers/vservices/protocol/block/server.c | 11 +++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/vservices/protocol/block/client.c b/drivers/vservices/protocol/block/client.c index 702a30a82a9d..bd499f35a3fb 100644 --- a/drivers/vservices/protocol/block/client.c +++ b/drivers/vservices/protocol/block/client.c @@ -93,7 +93,7 @@ static void block_handle_start(struct vs_service_device *service) to_client_driver(vsdrv)->client; vs_service_state_lock(service); - state->state = VSERVICE_BLOCK_RESET_STATE; + memset(&(state->state), 0, sizeof(state->state)); _vs_client_block_req_open(state); @@ -119,7 +119,7 @@ static void block_handle_reset(struct vs_service_device *service) if (client->closed) client->closed(state); - state->state = VSERVICE_BLOCK_RESET_STATE; + memset(&(state->state), 0, sizeof(state->state)); vs_service_state_unlock(service); } @@ -134,7 +134,7 @@ static void block_handle_start_bh(struct vs_service_device *service) to_client_driver(vsdrv)->client; vs_service_state_lock_bh(service); - state->state = VSERVICE_BLOCK_RESET_STATE; + memset(&(state->state), 0, sizeof(state->state)); _vs_client_block_req_open(state); @@ -160,7 +160,7 @@ static void block_handle_reset_bh(struct vs_service_device *service) if (client->closed) client->closed(state); - state->state = VSERVICE_BLOCK_RESET_STATE; + memset(&(state->state), 0, sizeof(state->state)); vs_service_state_unlock_bh(service); } @@ -265,7 +265,7 @@ static int block_client_probe(struct vs_service_device *service) return PTR_ERR(state); state->service = vs_get_service(service); - state->state = VSERVICE_BLOCK_RESET_STATE; + memset(&(state->state), 0, sizeof(state->state)); dev_set_drvdata(&service->dev, state); diff --git a/drivers/vservices/protocol/block/server.c b/drivers/vservices/protocol/block/server.c index a4a7d1a0c214..f0c55d1c6eae 100644 --- a/drivers/vservices/protocol/block/server.c +++ b/drivers/vservices/protocol/block/server.c @@ -59,8 +59,7 @@ static void block_handle_start(struct vs_service_device *service) to_server_driver(vsdrv)->server; vs_service_state_lock(service); - state->state = VSERVICE_BLOCK_RESET_STATE; - + memset(&(state->state), 0, sizeof(state->state)); vs_service_state_unlock(service); } @@ -83,7 +82,7 @@ static void block_handle_reset(struct vs_service_device *service) if (server->closed) server->closed(state); - state->state = VSERVICE_BLOCK_RESET_STATE; + memset(&(state->state), 0, sizeof(state->state)); vs_service_state_unlock(service); } @@ -98,7 +97,7 @@ static void block_handle_start_bh(struct vs_service_device *service) to_server_driver(vsdrv)->server; vs_service_state_lock_bh(service); - state->state = VSERVICE_BLOCK_RESET_STATE; + memset(&(state->state), 0, sizeof(state->state)); vs_service_state_unlock_bh(service); } @@ -122,7 +121,7 @@ static void block_handle_reset_bh(struct vs_service_device *service) if (server->closed) server->closed(state); - state->state = VSERVICE_BLOCK_RESET_STATE; + memset(&(state->state), 0, sizeof(state->state)); vs_service_state_unlock_bh(service); } @@ -237,7 +236,7 @@ static int block_server_probe(struct vs_service_device *service) return PTR_ERR(state); state->service = vs_get_service(service); - state->state = VSERVICE_BLOCK_RESET_STATE; + memset(&(state->state), 0, sizeof(state->state)); dev_set_drvdata(&service->dev, state);