On Wed, 29 Mar 2017 20:55:50 +0200, Clemens Ladisch wrote:

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

Applied to for-next branch. Thanks.

Takashi

---

sound/pci/oxygen/oxygen.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index 74afb6b75976..e36ed8af55ad 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c @@ -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 ||