]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ALSA: oxygen: simply setting of the shortname for Xonar DG cards
authorClemens Ladisch <clemens@ladisch.de>
Wed, 29 Mar 2017 18:55:50 +0000 (20:55 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 29 Mar 2017 19:14:20 +0000 (21:14 +0200)
We don't need to manually set the card name; with an entry in the
names[] array, this happens automatically.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/oxygen/oxygen.c

index 74afb6b75976c04a049d46aedc1e2b710dabdfe4..e36ed8af55adcb82c7cf2f69186271d7edcb7125 100644 (file)
@@ -767,6 +767,8 @@ static int get_oxygen_model(struct oxygen *chip,
                [MODEL_FANTASIA]        = "TempoTec HiFier Fantasia",
                [MODEL_SERENADE]        = "TempoTec HiFier Serenade",
                [MODEL_HG2PCI]          = "CMI8787-HG2PCI",
+               [MODEL_XONAR_DG]        = "Xonar DG",
+               [MODEL_XONAR_DGX]       = "Xonar DGX",
        };
 
        chip->model = model_generic;
@@ -829,12 +831,8 @@ static int get_oxygen_model(struct oxygen *chip,
                chip->model.dac_channels_mixer = 2;
                break;
        case MODEL_XONAR_DG:
-               chip->model = model_xonar_dg;
-               chip->model.shortname = "Xonar DG";
-               break;
        case MODEL_XONAR_DGX:
                chip->model = model_xonar_dg;
-               chip->model.shortname = "Xonar DGX";
                break;
        }
        if (id->driver_data == MODEL_MERIDIAN ||