Linux bluetooth development
 help / color / mirror / Atom feed
From: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ v2 09/10] device: Rename btd_device_device_set_name to btd_device_set_name
Date: Thu, 20 Aug 2026 14:30:36 -0400	[thread overview]
Message-ID: <20260820183037.2713973-10-luiz.dentz@gmail.com> (raw)
In-Reply-To: <20260820183037.2713973-1-luiz.dentz@gmail.com>

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

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


  parent reply	other threads:[~2026-08-20 18:31 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-20 18:30 [PATCH BlueZ v2 00/10] Replace the name2utf8 copies with str2utf8 Luiz Augusto von Dentz
2026-08-20 18:30 ` [PATCH BlueZ v2 01/10] eir: Fix stack buffer overflow when parsing the remote name Luiz Augusto von Dentz
2026-08-20 20:04   ` Replace the name2utf8 copies with str2utf8 bluez.test.bot
2026-08-20 18:30 ` [PATCH BlueZ v2 02/10] shared/ad: Fix reading past the name that was copied Luiz Augusto von Dentz
2026-08-20 18:30 ` [PATCH BlueZ v2 03/10] unit/test-eir: Add tests for the longest local names Luiz Augusto von Dentz
2026-08-20 18:30 ` [PATCH BlueZ v2 04/10] shared/util: Make strnlenutf8 reject ill-formed sequences Luiz Augusto von Dentz
2026-08-20 18:30 ` [PATCH BlueZ v2 05/10] shared/util: Add str2utf8 Luiz Augusto von Dentz
2026-08-20 18:30 ` [PATCH BlueZ v2 06/10] unit/test-util: Add str2utf8 tests Luiz Augusto von Dentz
2026-08-20 18:30 ` [PATCH BlueZ v2 07/10] Replace the name2utf8 copies with str2utf8 Luiz Augusto von Dentz
2026-08-20 18:30 ` [PATCH BlueZ v2 08/10] device: Fix the name truncation splitting UTF-8 sequences Luiz Augusto von Dentz
2026-08-20 18:30 ` Luiz Augusto von Dentz [this message]
2026-08-20 18:30 ` [PATCH BlueZ v2 10/10] unit/test-util: Cover strtoutf8 with the str2utf8 tests Luiz Augusto von Dentz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260820183037.2713973-10-luiz.dentz@gmail.com \
    --to=luiz.dentz@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox