Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp10249288ybi; Wed, 24 Jul 2019 19:18:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqxPpDyPcX6ocv3TwHpiOw3amm0okGZc+u2hw0cn8SxKWpzYDEa31dbr0DFeCFlGS0vss6kI X-Received: by 2002:a65:430b:: with SMTP id j11mr82613879pgq.383.1564021093426; Wed, 24 Jul 2019 19:18:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564021093; cv=none; d=google.com; s=arc-20160816; b=SLMzvKe5LnlFu4CI28zBsDojrtUl80h7Kj3dje1ASDf5vgTJPvP3brAsQzxSTzw0F3 1oHDSjnTbSWUQOAPWg/TGNsRe4z4wQQuz5nvqGdZp6it8e8jGakvV+YDfF8L9Tzvpb4j xj38IJgL96NV3TCrMc2Whkysv1SfxCuVxPjvoN2xOKTWx+Lh/oIaNU5lAGWA9GuSF7OR GnfU9OwU+ig92ojeDilSNnwm+gdNxxRbeWfo578lI6zBQQOtmXfMvp2U9QeFbDAwaj7U dscc+DLUf7QVswZutgaj+BCha7aKSRrAg+sM0iMp4T4A7Dj0y+G0ovBmBnl4zbTAUJuZ 3UIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JoSiXS5Xm89fXDVHc7Lzt1D5yrlDA/FC4Tpof5MEac8=; b=WXsWvWTHaZ72dCUkXrea1tlan48ogIEA+FSAlPfC7q8jbEGu+srRBX3GlU1033H05+ 0FR3sPZ/R0758gPN+6DaccvaYe7WwdZhOu0ezMDhD0rBHPwiuiItkBhnEBhQgiYSNgfz DamHCOBJmA0/NjI4Fp5H1zk1RLmIcjDCasswaV3/AFw5qqFLCajT9rNoW8FpNV7ax6Rq NxbKn+nD57POoUfkHymaL4/7GJhTDan0d8YYKo+RygMtuPWSlu4cKYIwcT8dPNPj9HQK KamX/V+sTpoVyAB15oQszq2tW+ENnj6B1FL+fb+A5B/acvqUG/b5+74jQsIZh7yvB/Uz 36nA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hagkxxHa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l10si19122249pgp.411.2019.07.24.19.17.45; Wed, 24 Jul 2019 19:18:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hagkxxHa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389169AbfGXTiQ (ORCPT + 99 others); Wed, 24 Jul 2019 15:38:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:38758 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389599AbfGXTiO (ORCPT ); Wed, 24 Jul 2019 15:38:14 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4406320665; Wed, 24 Jul 2019 19:38:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563997093; bh=M+L7com3nJRTUBvOiXLK/bSWKgACj6V09CyXepgskKE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hagkxxHa7CG+5L1zMS2A4DAq+iicTrtcVWcnk44ehjBJrQ7Y6cTG5UAPpCRaheacY DFGFSucP3gb1sILeNoeGVPn+iHYPvllVZzMxNkiaLsog1zV2BGs6U5ujRdt9ekjxJv DA/REMF6bvsreCxQoGwEVY4LSxrrSczOLreVHwpc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 5.2 318/413] ALSA: hda/hdmi - Remove duplicated define Date: Wed, 24 Jul 2019 21:20:09 +0200 Message-Id: <20190724191758.643201500@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190724191735.096702571@linuxfoundation.org> References: <20190724191735.096702571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Iwai commit eb4177116bf568a413c544eca3f4446cb4064be9 upstream. INTEL_GET_VENDOR_VERB is defined twice identically. Let's remove a superfluous line. Fixes: b0d8bc50b9f2 ("ALSA: hda: hdmi - add Icelake support") Cc: Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/hda/patch_hdmi.c | 1 - 1 file changed, 1 deletion(-) --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2418,7 +2418,6 @@ static void intel_haswell_fixup_connect_ } #define INTEL_GET_VENDOR_VERB 0xf81 -#define INTEL_GET_VENDOR_VERB 0xf81 #define INTEL_SET_VENDOR_VERB 0x781 #define INTEL_EN_DP12 0x02 /* enable DP 1.2 features */ #define INTEL_EN_ALL_PIN_CVTS 0x01 /* enable 2nd & 3rd pins and convertors */