From 7a9ad8c635c3cc8993aaa4c1509eea8745d56069 Mon Sep 17 00:00:00 2001
From: Simon Busch <morphis@gravedo.de>
Date: Wed, 8 Aug 2012 15:57:50 +0200
Subject: Simplify open/close handler signature

---
 samsung-ipc/device/crespo/crespo_ipc.c   | 5 ++---
 samsung-ipc/device/xmm6260/xmm6260_ipc.c | 5 ++---
 samsung-ipc/device/xmm6260/xmm6260_ipc.h | 4 ++--
 samsung-ipc/ipc.c                        | 4 ++--
 samsung-ipc/ipc_private.h                | 5 +++--
 5 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'samsung-ipc')

diff --git a/samsung-ipc/device/crespo/crespo_ipc.c b/samsung-ipc/device/crespo/crespo_ipc.c
index 561909d..aeac266 100644
--- a/samsung-ipc/device/crespo/crespo_ipc.c
+++ b/samsung-ipc/device/crespo/crespo_ipc.c
@@ -451,9 +451,8 @@ int crespo_ipc_rfs_client_recv(struct ipc_client *client, struct ipc_message_inf
     return 0;
 }
 
-int crespo_ipc_open(void *data, unsigned int size, void *io_data)
+int crespo_ipc_open(int type, void *io_data)
 {
-    int type = *((int *) data);
     int fd = -1;
 
     switch(type)
@@ -479,7 +478,7 @@ int crespo_ipc_open(void *data, unsigned int size, void *io_data)
     return 0;
 }
 
-int crespo_ipc_close(void *data, unsigned int size, void *io_data)
+int crespo_ipc_close(void *io_data)
 {
     int fd = -1;
 
diff --git a/samsung-ipc/device/xmm6260/xmm6260_ipc.c b/samsung-ipc/device/xmm6260/xmm6260_ipc.c
index 4b089c8..5f4aad1 100644
--- a/samsung-ipc/device/xmm6260/xmm6260_ipc.c
+++ b/samsung-ipc/device/xmm6260/xmm6260_ipc.c
@@ -211,9 +211,8 @@ int xmm6260_ipc_rfs_client_send(struct ipc_client *client, struct ipc_message_in
     return rc;
 }
 
-int xmm6260_ipc_open(void *data, unsigned int size, void *io_data)
+int xmm6260_ipc_open(int type, void *io_data)
 {
-    int type = *((int *) data);
     int fd = -1;
 
     switch(type)
@@ -239,7 +238,7 @@ int xmm6260_ipc_open(void *data, unsigned int size, void *io_data)
     return 0;
 }
 
-int xmm6260_ipc_close(void *data, unsigned int size, void *io_data)
+int xmm6260_ipc_close(void *io_data)
 {
     int fd = -1;
 
diff --git a/samsung-ipc/device/xmm6260/xmm6260_ipc.h b/samsung-ipc/device/xmm6260/xmm6260_ipc.h
index 5850991..58bd8a2 100644
--- a/samsung-ipc/device/xmm6260/xmm6260_ipc.h
+++ b/samsung-ipc/device/xmm6260/xmm6260_ipc.h
@@ -40,8 +40,8 @@ int xmm6260_ipc_fmt_client_send(struct ipc_client *client, struct ipc_message_in
 int xmm6260_ipc_fmt_client_recv(struct ipc_client *client, struct ipc_message_info *response);
 int xmm6260_ipc_rfs_client_recv(struct ipc_client *client, struct ipc_message_info *response);
 int xmm6260_ipc_rfs_client_send(struct ipc_client *client, struct ipc_message_info *request);
-int xmm6260_ipc_open(void *data, unsigned int size, void *io_data);
-int xmm6260_ipc_close(void *data, unsigned int size, void *io_data);
+int xmm6260_ipc_open(int type, void *io_data);
+int xmm6260_ipc_close(void *io_data);
 int xmm6260_ipc_read(void *data, unsigned int size, void *io_data);
 int xmm6260_ipc_write(void *data, unsigned int size, void *io_data);
 int xmm6260_ipc_power_on(void *io_data);
diff --git a/samsung-ipc/ipc.c b/samsung-ipc/ipc.c
index 9149705..ee27c4d 100644
--- a/samsung-ipc/ipc.c
+++ b/samsung-ipc/ipc.c
@@ -331,7 +331,7 @@ int ipc_client_open(struct ipc_client *client)
 
     type = client->type;
 
-    return client->handlers->open(&type, 0, client->handlers->open_data);
+    return client->handlers->open(type, client->handlers->open_data);
 }
 
 int ipc_client_close(struct ipc_client *client)
@@ -341,7 +341,7 @@ int ipc_client_close(struct ipc_client *client)
         client->handlers->close == NULL)
         return -1;
 
-    return client->handlers->close(NULL, 0, client->handlers->close_data);
+    return client->handlers->close(client->handlers->close_data);
 }
 
 int ipc_client_power_on(struct ipc_client *client)
diff --git a/samsung-ipc/ipc_private.h b/samsung-ipc/ipc_private.h
index d97cbd0..6c7e0ad 100644
--- a/samsung-ipc/ipc_private.h
+++ b/samsung-ipc/ipc_private.h
@@ -35,9 +35,10 @@ struct ipc_handlers {
     void *read_data;
     ipc_io_handler_cb write;
     void *write_data;
-    ipc_io_handler_cb open;
+
+    int (*open)(int type, void *io_data);
+    int (*close)(void *io_data);
     void *open_data;
-    ipc_io_handler_cb close;
     void *close_data;
 
     /* Power handlers */
-- 
cgit v1.1