Rename client add remove ops

For consistency, rename the symbols add_device and remove_device
to device_add and device_remove.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

4 files changed, 15 insertions, 15 deletions

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index 6b991b1..b1ef440 100644
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -81,7 +81,7 @@ void discover_client_destroy(struct discover_client *client)
 	talloc_free(client);
 }
 
-static void add_device(struct discover_client *client, struct device *device)
+static void device_add(struct discover_client *client, struct device *device)
 {
 	client->n_devices++;
 	client->devices = talloc_realloc(client, client->devices,
@@ -90,10 +90,10 @@ static void add_device(struct discover_client *client, struct device *device)
 	client->devices[client->n_devices - 1] = device;
 	talloc_steal(client, device);
 
-	client->ops.add_device(device, client->ops.cb_arg);
+	client->ops.device_add(device, client->ops.cb_arg);
 }
 
-static void remove_device(struct discover_client *client, const char *id)
+static void device_remove(struct discover_client *client, const char *id)
 {
 	struct device *device = NULL;
 	int i;
@@ -116,7 +116,7 @@ static void remove_device(struct discover_client *client, const char *id)
 			struct device *, client->n_devices);
 
 	/* notify the UI */
-	client->ops.remove_device(device, client->ops.cb_arg);
+	client->ops.device_remove(device, client->ops.cb_arg);
 
 	talloc_free(device);
 }
@@ -140,7 +140,7 @@ int discover_client_process(struct discover_client *client)
 			return 0;
 		}
 
-		add_device(client, dev);
+		device_add(client, dev);
 		break;
 	case PB_PROTOCOL_ACTION_REMOVE:
 		dev_id = pb_protocol_deserialise_string(client, message);
@@ -148,7 +148,7 @@ int discover_client_process(struct discover_client *client)
 			pb_log("%s: no device id?\n", __func__);
 			return 0;
 		}
-		remove_device(client, dev_id);
+		device_remove(client, dev_id);
 		break;
 	default:
 		pb_log("%s: unknown action %d\n", __func__, message->action);
diff --git a/ui/common/discover-client.h b/ui/common/discover-client.h
index fdcf930..d2a8fc4 100644
--- a/ui/common/discover-client.h
+++ b/ui/common/discover-client.h
@@ -7,14 +7,14 @@ struct discover_client;
 
 /**
  * struct discover_client_ops - Application supplied client info.
- * @add_device: PB_PROTOCOL_ACTION_ADD event callback.
- * @remove_device: PB_PROTOCOL_ACTION_REMOVE event callback.
+ * @device_add: PB_PROTOCOL_ACTION_ADD event callback.
+ * @device_remove: PB_PROTOCOL_ACTION_REMOVE event callback.
  * @cb_arg: Client managed convenience variable passed to callbacks.
  */
 
 struct discover_client_ops {
-	int (*add_device)(const struct device *device, void *arg);
-	void (*remove_device)(const struct device *device, void *arg);
+	int (*device_add)(const struct device *device, void *arg);
+	void (*device_remove)(const struct device *device, void *arg);
 	void *cb_arg;
 };
 
@@ -28,7 +28,7 @@ void discover_client_destroy(struct discover_client *client);
 /**
  * Process data from the server.
  *
- * Will read from the client socket, and call add_device on any discovered
+ * Will read from the client socket, and call device_add on any discovered
  * devices.
  * 
  */
diff --git a/ui/test/pb-test.c b/ui/test/pb-test.c
index a1e3007..69f65fb 100644
--- a/ui/test/pb-test.c
+++ b/ui/test/pb-test.c
@@ -37,8 +37,8 @@ static void print_device_remove(const struct device *device,
 }
 
 static struct discover_client_ops client_ops = {
-	.add_device = print_device_add,
-	.remove_device = print_device_remove,
+	.device_add = print_device_add,
+	.device_remove = print_device_remove,
 };
 
 int main(void)
diff --git a/ui/twin/pb-twin.c b/ui/twin/pb-twin.c
index ee68930..a5c0a27 100644
--- a/ui/twin/pb-twin.c
+++ b/ui/twin/pb-twin.c
@@ -968,7 +968,7 @@ static void pboot_create_spane(void)
 	twin_window_queue_paint(pboot_spane->window);
 }
 
-int pboot_add_device(const char *dev_id, const char *name,
+int pboot_device_add(const char *dev_id, const char *name,
 		twin_pixmap_t *pixmap)
 {
 	int		index;
@@ -1000,7 +1000,7 @@ int pboot_add_device(const char *dev_id, const char *name,
 	return index;
 }
 
-int pboot_remove_device(const char *dev_id)
+int pboot_device_remove(const char *dev_id)
 {
 	pboot_device_t	*dev = NULL;
 	int		i, newsel = pboot_dev_sel;