ALSA: snd_usb_caiaq: give better longname
Daniel Mack [Mon, 1 Jun 2009 19:36:26 +0000 (21:36 +0200)]
The serial number is of no interest in the longname, remove it. This
gives space for the usb path information which is more informative.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

sound/usb/caiaq/device.c
sound/usb/caiaq/device.h

index d06d7fc..15052e4 100644 (file)
@@ -382,10 +382,10 @@ static int create_card(struct usb_device* usb_dev, struct snd_card **cardp)
 
 static int __devinit init_card(struct snd_usb_caiaqdev *dev)
 {
-       char *c;
+       char usbpath[32];
        struct usb_device *usb_dev = dev->chip.dev;
        struct snd_card *card = dev->chip.card;
-       int err, len;
+       int err;
 
        if (usb_set_interface(usb_dev, 0, 1) != 0) {
                log("can't set alt interface.\n");
@@ -424,27 +424,14 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev)
        usb_string(usb_dev, usb_dev->descriptor.iProduct,
                   dev->product_name, CAIAQ_USB_STR_LEN);
 
-       usb_string(usb_dev, usb_dev->descriptor.iSerialNumber,
-                  dev->serial, CAIAQ_USB_STR_LEN);
-
-       /* terminate serial string at first white space occurence */
-       c = strchr(dev->serial, ' ');
-       if (c)
-               *c = '\0';
-
        strlcpy(card->driver, MODNAME, sizeof(card->driver));
        strlcpy(card->shortname, dev->product_name, sizeof(card->shortname));
 
-       len = snprintf(card->longname, sizeof(card->longname),
-                      "%s %s (serial %s, ",
-                      dev->vendor_name, dev->product_name, dev->serial);
-
-       if (len < sizeof(card->longname) - 2)
-               len += usb_make_path(usb_dev, card->longname + len,
-                                    sizeof(card->longname) - len);
+       usb_make_path(usb_dev, usbpath, sizeof(usbpath));
+       snprintf(card->longname, sizeof(card->longname),
+                      "%s %s (%s)",
+                      dev->vendor_name, dev->product_name, usbpath);
 
-       card->longname[len++] = ')';
-       card->longname[len] = '\0';
        setup_card(dev);
        return 0;
 }
index 4cce1ad..ece7351 100644 (file)
@@ -81,7 +81,6 @@ struct snd_usb_caiaqdev {
 
        char vendor_name[CAIAQ_USB_STR_LEN];
        char product_name[CAIAQ_USB_STR_LEN];
-       char serial[CAIAQ_USB_STR_LEN];
 
        int n_streams, n_audio_in, n_audio_out;
        int streaming, first_packet, output_running;