diff mbox

[3/3] ALSA: usb-audio: Use strim() instead of open code

Message ID 1415019726-25710-4-git-send-email-tiwai@suse.de (mailing list archive)
State Accepted
Commit ae366c2049b48b54e5250cb57438bbebd1dbe610
Delegated to: Takashi Iwai
Headers show

Commit Message

Takashi Iwai Nov. 3, 2014, 1:02 p.m. UTC 
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/usb/card.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)
diff mbox

Patch

diff --git a/sound/usb/card.c b/sound/usb/card.c
index fa6c0972aa23..69725d5fa2d6 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -321,16 +321,6 @@  static int snd_usb_audio_dev_free(struct snd_device *device)
 	return snd_usb_audio_free(chip);
 }
 
-static void remove_trailing_spaces(char *str)
-{
-	char *p;
-
-	if (!*str)
-		return;
-	for (p = str + strlen(str) - 1; p >= str && isspace(*p); p--)
-		*p = 0;
-}
-
 /*
  * create a chip instance and set its names.
  */
@@ -414,7 +404,7 @@  static int snd_usb_audio_create(struct usb_interface *intf,
 				USB_ID_PRODUCT(chip->usb_id));
 		}
 	}
-	remove_trailing_spaces(card->shortname);
+	strim(card->shortname);
 
 	/* retrieve the vendor and device strings as longname */
 	if (quirk && quirk->vendor_name && *quirk->vendor_name) {
@@ -428,7 +418,7 @@  static int snd_usb_audio_create(struct usb_interface *intf,
 		/* we don't really care if there isn't any vendor string */
 	}
 	if (len > 0) {
-		remove_trailing_spaces(card->longname);
+		strim(card->longname);
 		if (*card->longname)
 			strlcat(card->longname, " ", sizeof(card->longname));
 	}