diff mbox

[09/12] bebob: Use different names for identifiers in the same file

Message ID 1401203687-4189-10-git-send-email-o-takashi@sakamocchi.jp (mailing list archive)
State Accepted
Commit 791c67b427dfebfd930228ce33a42e70d6d7a7d3
Delegated to: Takashi Iwai
Headers show

Commit Message

Takashi Sakamoto May 27, 2014, 3:14 p.m. UTC 
To suppress 'sparse' warning.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---
 sound/firewire/bebob/bebob.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c
index 31b96b7..b5e8f99 100644
--- a/sound/firewire/bebob/bebob.c
+++ b/sound/firewire/bebob/bebob.c
@@ -69,7 +69,7 @@  name_device(struct snd_bebob *bebob, unsigned int vendor_id)
 	struct fw_device *fw_dev = fw_parent_device(bebob->unit);
 	char vendor[24] = {0};
 	char model[32] = {0};
-	u32 id;
+	u32 hw_id;
 	u32 data[2] = {0};
 	u32 revision;
 	int err;
@@ -88,7 +88,7 @@  name_device(struct snd_bebob *bebob, unsigned int vendor_id)
 
 	/* get hardware id */
 	err = snd_bebob_read_quad(bebob->unit, INFO_OFFSET_HW_MODEL_ID,
-				  &id);
+				  &hw_id);
 	if (err < 0)
 		goto end;
 
@@ -109,7 +109,7 @@  name_device(struct snd_bebob *bebob, unsigned int vendor_id)
 	strcpy(bebob->card->mixername, model);
 	snprintf(bebob->card->longname, sizeof(bebob->card->longname),
 		 "%s %s (id:%d, rev:%d), GUID %08x%08x at %s, S%d",
-		 vendor, model, id, revision,
+		 vendor, model, hw_id, revision,
 		 data[0], data[1], dev_name(&bebob->unit->device),
 		 100 << fw_dev->max_speed);
 end: