[PATCH BlueZ v2 09/10] device: Rename btd_device_device_set_name to btd_device_set_name

Luiz Augusto von Dentz <[email protected]>
Newsgroups org.kernel.vger.linux-bluetooth
Message-ID <[email protected]>
From: Luiz Augusto von Dentz <[email protected]>

The "device" was in there twice.

Assisted-by: Claude:claude-opus-5
---
 plugins/neard.c    | 2 +-
 plugins/sixaxis.c  | 2 +-
 profiles/gap/gas.c | 2 +-
 src/adapter.c      | 4 ++--
 src/device.c       | 2 +-
 src/device.h       | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/neard.c b/plugins/neard.c
index edfc115373ef..1633dd576747 100644
--- a/plugins/neard.c
+++ b/plugins/neard.c
@@ -629,7 +629,7 @@ static void store_params(struct btd_adapter *adapter, struct btd_device *device,
 
 	if (params->name) {
 		device_store_cached_name(device, params->name);
-		btd_device_device_set_name(device, params->name);
+		btd_device_set_name(device, params->name);
 	}
 
 	if (params->services)
diff --git a/plugins/sixaxis.c b/plugins/sixaxis.c
index a04a76d394eb..fc2b2a9d0156 100644
--- a/plugins/sixaxis.c
+++ b/plugins/sixaxis.c
@@ -362,7 +362,7 @@ static bool setup_device(int fd, const char *sysfs_path,
 
 	info("sixaxis: setting up new device");
 
-	btd_device_device_set_name(device, cp->name);
+	btd_device_set_name(device, cp->name);
 	btd_device_set_pnpid(device, cp->source, cp->vid, cp->pid, cp->version);
 	btd_device_set_temporary(device, true);
 
diff --git a/profiles/gap/gas.c b/profiles/gap/gas.c
index 5184d74e8f07..495799e641d9 100644
--- a/profiles/gap/gas.c
+++ b/profiles/gap/gas.c
@@ -86,7 +86,7 @@ static void read_device_name_cb(bool success, uint8_t att_ecode,
 
 	DBG("GAP Device Name: %s", name);
 
-	btd_device_device_set_name(gas->device, name);
+	btd_device_set_name(gas->device, name);
 
 	free(name);
 }
diff --git a/src/adapter.c b/src/adapter.c
index c21b3e7fbcc2..cf59db4aa5a9 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -7628,7 +7628,7 @@ void btd_adapter_device_found(struct btd_adapter *adapter,
 	name_known = device_name_known(dev);
 
 	if (eir_data.name && (eir_data.name_complete || !name_known))
-		btd_device_device_set_name(dev, eir_data.name);
+		btd_device_set_name(dev, eir_data.name);
 
 	if (eir_data.class != 0)
 		device_set_class(dev, eir_data.class);
@@ -9814,7 +9814,7 @@ static void connected_callback(uint16_t index, uint16_t length,
 
 	if (eir_data.name && (eir_data.name_complete || !name_known)) {
 		device_store_cached_name(device, eir_data.name);
-		btd_device_device_set_name(device, eir_data.name);
+		btd_device_set_name(device, eir_data.name);
 	}
 
 	if (eir_data.msd_list)
diff --git a/src/device.c b/src/device.c
index df607f718be1..9609a14f7883 100644
--- a/src/device.c
+++ b/src/device.c
@@ -5101,7 +5101,7 @@ char *btd_device_get_storage_path(struct btd_device *device, const char *name)
 	return strdup(filename);
 }
 
-void btd_device_device_set_name(struct btd_device *device, const char *name)
+void btd_device_set_name(struct btd_device *device, const char *name)
 {
 	size_t len;
 
diff --git a/src/device.h b/src/device.h
index b890f23d4642..7683be82ee3f 100644
--- a/src/device.h
+++ b/src/device.h
@@ -23,7 +23,7 @@ char *btd_device_get_storage_path(struct btd_device *device,
 				const char *filename);
 
 
-void btd_device_device_set_name(struct btd_device *device, const char *name);
+void btd_device_set_name(struct btd_device *device, const char *name);
 void device_store_cached_name(struct btd_device *dev, const char *name);
 void device_get_name(struct btd_device *device, char *name, size_t len);
 bool device_name_known(struct btd_device *device);
-- 
2.54.0
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.