From patchwork Mon Feb 14 23:16:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Lane X-Patchwork-Id: 1592840 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=AucwSok5; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JyKpz0R48z9sFw for ; Tue, 15 Feb 2022 10:16:26 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nJkZw-0002Xv-1o; Mon, 14 Feb 2022 23:16:20 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nJkZt-0002XJ-FB for kernel-team@lists.ubuntu.com; Mon, 14 Feb 2022 23:16:17 +0000 Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 504BA3F1B6 for ; Mon, 14 Feb 2022 23:16:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644880577; bh=uGcaWKLPzWYkuMBuIEwKsIvoILNWYwGLYFtqeybpZnY=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AucwSok5HnwOV/K1K1ByAsRXGE0sheGvGJpn05qErIBOmznOtGqL7Gsy6yff2Q8Dc R6loPQb0xUrkhh5LvQn/F8mGf7Pyag/XVnakFqmtuqHJTYShc8ovF4Mr6vgC7KLVeX mANPxYyXh+bna6mFkLRx0R0TbMvyw6ZdafjLC0zX2GxNH/LuRHIIygsu890lUh25uH Ziiu3kg/v9tIV2OjyxIzhwRVNToOHhMPlhU55Fs9zMd/4jTky7f2utNbZ1G8KXWCUx 5hovgMCn+T1r8p3985qDlb7oM8ROX1PmnooBYMTulnPCuHTBCCAbYH9qvdrkRyvU0R uhzBnVuggCHwA== Received: by mail-qt1-f200.google.com with SMTP id x10-20020ac8700a000000b002c3ef8fc44cso13657280qtm.8 for ; Mon, 14 Feb 2022 15:16:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uGcaWKLPzWYkuMBuIEwKsIvoILNWYwGLYFtqeybpZnY=; b=MPzEeLkbjjkWrKH6CgwLqtrFgy9x+qRFMFgN3DBzPtg/jl/XSC4GJOY+9JMyapYc8E B9ZbypCbOGerUYDvLBr/CfN7qVFDkOU2xOXS81TFazsqG6OLHpqRgE9JVCM5uKZ339vX mKUbUZzRKosRBCuTTe1AlaiPWkJU/vH6Zq75dj38mm0Lnw03OnVocKL+w786jQNjH/Rv ndUVBFhaUrfEK3b5uNNAQ79pCf95pZnD9Nl7WeuteP6cld3f5NaveOyLnTeOc4n5gqsX inKb3QwFxl0T1fmbfHyrFKJ3Bn+UsRuToovUMnoz3wg5F56ZTcHs/DA2eTjE1Vg37So8 Jdpw== X-Gm-Message-State: AOAM530IvD/bxd9weVJJb6RjDbDl4mA7qMoKb0hiu0uxVsNZNi2yVwnS 5enFuq4+Ma7D3clQ7N/1HmScHqqom9berURtfNLtUMgIu6R6r5hFG4ZMEXDdBYqmk0TPaxLAoCK aNfY02ofD7IznaQX+6FokTXXzLdnM7s4nA0D1ZDhw/A== X-Received: by 2002:ac8:578e:: with SMTP id v14mr930309qta.45.1644880575944; Mon, 14 Feb 2022 15:16:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJyQZ+rc6r8/ddArJkeLDUpQONBQQbV0PgcXi6gsstvJpMfrb47i5ZoHKFnCoRHuyJmdMUeNFw== X-Received: by 2002:ac8:578e:: with SMTP id v14mr930289qta.45.1644880575554; Mon, 14 Feb 2022 15:16:15 -0800 (PST) Received: from localhost.localdomain ([71.217.161.186]) by smtp.gmail.com with ESMTPSA id h13sm3389428qkm.38.2022.02.14.15.16.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Feb 2022 15:16:15 -0800 (PST) From: Jeff Lane To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/3] hwmon: (k10temp) Remove unused definitions Date: Mon, 14 Feb 2022 18:16:09 -0500 Message-Id: <20220214231611.4017202-2-jeffrey.lane@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220214231611.4017202-1-jeffrey.lane@canonical.com> References: <20220214231611.4017202-1-jeffrey.lane@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Babu Moger BugLink: http://bugs.launchpad.net/bugs/1960361 Usage of these definitions were removed after the commit 0a4e668b5d52 ("hwmon: (k10temp) Remove support for displaying voltage and current on Zen CPUs"). So, cleanup them up. Signed-off-by: Babu Moger Link: https://lore.kernel.org/r/163640828776.955062.15863375803675701204.stgit@bmoger-ubuntu Signed-off-by: Guenter Roeck (cherry picked from commit f707bcb5d1cb4c47d27c688c859dcdb70e3c7065) Signed-off-by: Jeff Lane --- drivers/hwmon/k10temp.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index 3618a924e78e..662bad7ed0a2 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c @@ -76,26 +76,6 @@ static DEFINE_MUTEX(nb_smu_ind_mutex); #define ZEN_CUR_TEMP_SHIFT 21 #define ZEN_CUR_TEMP_RANGE_SEL_MASK BIT(19) -#define ZEN_SVI_BASE 0x0005A000 - -/* F17h thermal registers through SMN */ -#define F17H_M01H_SVI_TEL_PLANE0 (ZEN_SVI_BASE + 0xc) -#define F17H_M01H_SVI_TEL_PLANE1 (ZEN_SVI_BASE + 0x10) -#define F17H_M31H_SVI_TEL_PLANE0 (ZEN_SVI_BASE + 0x14) -#define F17H_M31H_SVI_TEL_PLANE1 (ZEN_SVI_BASE + 0x10) - -#define F17H_M01H_CFACTOR_ICORE 1000000 /* 1A / LSB */ -#define F17H_M01H_CFACTOR_ISOC 250000 /* 0.25A / LSB */ -#define F17H_M31H_CFACTOR_ICORE 1000000 /* 1A / LSB */ -#define F17H_M31H_CFACTOR_ISOC 310000 /* 0.31A / LSB */ - -/* F19h thermal registers through SMN */ -#define F19H_M01_SVI_TEL_PLANE0 (ZEN_SVI_BASE + 0x14) -#define F19H_M01_SVI_TEL_PLANE1 (ZEN_SVI_BASE + 0x10) - -#define F19H_M01H_CFACTOR_ICORE 1000000 /* 1A / LSB */ -#define F19H_M01H_CFACTOR_ISOC 310000 /* 0.31A / LSB */ - struct k10temp_data { struct pci_dev *pdev; void (*read_htcreg)(struct pci_dev *pdev, u32 *regval);