From nobody Fri Oct 18 08:45:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XVJDk1HdPz5YwPs; Fri, 18 Oct 2024 08:45:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XVJDj69Wjz4mpL; Fri, 18 Oct 2024 08:45:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729241109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=alYIANWGsZitXwkzXkL5Nbse2V/eak+aeC9WH+k2qjQ=; b=wKy2D+P/IQLVT+ztFmkANSYJZnpx8u4qnhsx9OCIulzq4iTVbJG7eIzY5F4lW4UWmD8GDB 4QgaLC2mU0hWSvAQ4as2l2JTqpayY4usdTUiSUxsjAcu+371XxeSZPL5Zo1pUkpOk7nu9T Ok0SHasF2XPct+8EhfLEGV+3XpkmnafGRhpXi4YXmZaNAUraPEXrHh+EbwF9d1C6d1otZT 9a4UAazztFdMIwfO39XW8xvnJmHfVWLPFmVta+8i4fyQiP6K2isWznbDqe7DWnd996sqjl 0by8UT6tC80U9HFMnWUTrNH4ktbu8fUzpOT0HQWDBsmTSa3LL83JRUMBIy5ctQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729241109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=alYIANWGsZitXwkzXkL5Nbse2V/eak+aeC9WH+k2qjQ=; b=j7rBCJ8mk7JdkotY1TNEf8uI7Uacp98Gtnidj+e8kHKb/DiPNNZGhJv3AQKTLn3bKwyEXB 8o97hcQuBnrc6CZW8X17Gw82dYq63EDDXoGYJ/5QQdRhJYu54vVfORfqF21orfnOs5jsli XHs2lHORo1V5UfLFcOurNRC1w4XvOKg5nZWyZIS6K9MQ1NvBdR81moKyFxhZFVUN5X6cQH GhUJz6hsfMKcnUNy78fvZ8tKSSAR89YHohBu7xeVZPsn0H3RQPirdX1SARPPLh1r15CHJm qCP+03Mrd6TjJhNCR0mAyI5KlgS1/zJsSq3B3W7DuwG+Q3EPBv9eG9fGGRRACQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729241109; a=rsa-sha256; cv=none; b=I6kea5AAdli7AjRbP3wYIa22xJB2Y8KSnv0Lq81ntjXwSLt3xBzfdwJW26mDjguHy9XalP 7SguV2YIg14jcD4bpTlgqu443fyILiZCxc/IEFbqCw9UXsAXsKLTia4LFxTPdZIvO/o9BO BSqqWNQMa8pmQuZP43CW89VAVqWIb1vKiHoVGgAmO6mtud1eiK8Y499cHOqAyGV7s91dA7 sEqnBTJrNhVjof7zhPSDBdLsnZo0lCjJQzd1exhmmnTtPsid7v7b75x00zr+HNRBxm+qqJ 3AJvHGvNzOD5HZfdxJbF/VnhAOOPvTWcozjioE3glFN6odsQWD29f4omh0HLyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XVJDj5lyKzRmB; Fri, 18 Oct 2024 08:45:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49I8j9O4088550; Fri, 18 Oct 2024 08:45:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49I8j9rR088547; Fri, 18 Oct 2024 08:45:09 GMT (envelope-from git) Date: Fri, 18 Oct 2024 08:45:09 GMT Message-Id: <202410180845.49I8j9rR088547@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: de009cf68ba6 - main - snd_hda: Remove duplicate HDA_INTEL_CMLK* entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de009cf68ba68aa5823be3d6afeebb49a15b1251 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=de009cf68ba68aa5823be3d6afeebb49a15b1251 commit de009cf68ba68aa5823be3d6afeebb49a15b1251 Author: Christos Margiolis AuthorDate: 2024-10-18 08:41:36 +0000 Commit: Christos Margiolis CommitDate: 2024-10-18 08:41:36 +0000 snd_hda: Remove duplicate HDA_INTEL_CMLK* entries No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 2 days Reviewed by: markj, emaste Differential Revision: https://reviews.freebsd.org/D47152 --- sys/dev/sound/pci/hda/hdac.c | 2 -- sys/dev/sound/pci/hda/hdac.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index cd5fc6adb80d..929080b7ac69 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -106,8 +106,6 @@ static const struct { { HDA_INTEL_CMLKS, "Intel Comet Lake-S", 0, 0 }, { HDA_INTEL_CNLK, "Intel Cannon Lake", 0, 0 }, { HDA_INTEL_ICLK, "Intel Ice Lake", 0, 0 }, - { HDA_INTEL_CMLKLP, "Intel Comet Lake-LP", 0, 0 }, - { HDA_INTEL_CMLKH, "Intel Comet Lake-H", 0, 0 }, { HDA_INTEL_TGLK, "Intel Tiger Lake", 0, 0 }, { HDA_INTEL_TGLKH, "Intel Tiger Lake-H", 0, 0 }, { HDA_INTEL_GMLK, "Intel Gemini Lake", 0, 0 }, diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index 5e66e8eaed59..91ddbcccc9ed 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -95,8 +95,6 @@ #define HDA_INTEL_CMLKS HDA_MODEL_CONSTRUCT(INTEL, 0xa3f0) #define HDA_INTEL_CNLK HDA_MODEL_CONSTRUCT(INTEL, 0x9dc8) #define HDA_INTEL_ICLK HDA_MODEL_CONSTRUCT(INTEL, 0x34c8) -#define HDA_INTEL_CMLKLP HDA_MODEL_CONSTRUCT(INTEL, 0x02c8) -#define HDA_INTEL_CMLKH HDA_MODEL_CONSTRUCT(INTEL, 0x06c8) #define HDA_INTEL_TGLK HDA_MODEL_CONSTRUCT(INTEL, 0xa0c8) #define HDA_INTEL_TGLKH HDA_MODEL_CONSTRUCT(INTEL, 0x43c8) #define HDA_INTEL_MTL HDA_MODEL_CONSTRUCT(INTEL, 0x7e28)