From patchwork Fri Jul 28 01:11:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 127275 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp122799vqg; Thu, 27 Jul 2023 18:34:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlG4cWAtfBs1g7kXxMrtDYecmDhDzQzl1COZ3esY6PBFnXp+eTELrc692AMSCZxjKxmI+Rp/ X-Received: by 2002:a05:6512:2098:b0:4fe:af1:c3ae with SMTP id t24-20020a056512209800b004fe0af1c3aemr573559lfr.15.1690508079787; Thu, 27 Jul 2023 18:34:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690508079; cv=none; d=google.com; s=arc-20160816; b=KQdkAG8nog8vT8zLYsW5M2nB5lbqa19ugB4uQ0QOboO5TZ5XAbwvBSZ3juTxqsGh4w Qj5ov9cwYD8WAUK3OP/CNfPt+9NvTayj0hSq5b0MdGD2r9NQHIkLsBsV3OZm8Y0tbj+h X2YVRdasI347bNB8r9EeJfV6R3k6vQGzx1twOhMd6bvzjHMT2Wzhr4Ye4p2vtZFnpOX7 gXEJGxxrm2sbOtQeQIKn4fT2QglPWhvfcaiopVglvHe8Qq5W3qYTmVgCTmxblNTpy/bQ cF00G8dT5S+cQXqk+ZM0mpnwdIfprV5pRUG5JhtDEEf3OTTc46NOfRYpcd2K3q+3J+qs kj3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=YwjMXrlmohJGv2d3xIQLvbpFtXYP5IQTL3JwTffYMDA=; fh=zQrOkGOlEUmWEDShl8wdNEk0E66cAv02M5ELfiXoHWk=; b=DbozKaBPq0Cv/Wyl/nmQnvzabPjeu90xhwDNRTMmdscIIyq3iFeIOJGfuwM1jf1yZ8 LprqLS/UT8TB7/zPvoitvlQqTv7kaFGlFTAwCwSHAYap5lrZdJHlFPaJNtpBJGhD26UL u/+KZjqAsSVBSye/B+wndtwabFAJYHVfr/zYKZX3e3gJ6Xbczwy/vaP+l6vAeZyboWnM vfEocjBm3qJyUkdqhU7SjRF3dIPnsGI1urqRzBpadaJREXNR/plKeUPL2ZNwfA5ZI+5V 3GoO81b6vNPFN2sPcmdBa1SnJ0gz0BRO3QL6zaz6a7fgeoz4NUjMnQp1yVX1j6Hg1Yvp SqzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=EwbfeJbC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r24-20020aa7d598000000b0051de11a08e9si1807106edq.246.2023.07.27.18.34.16; Thu, 27 Jul 2023 18:34:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=EwbfeJbC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231358AbjG1BMR (ORCPT + 99 others); Thu, 27 Jul 2023 21:12:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231776AbjG1BMO (ORCPT ); Thu, 27 Jul 2023 21:12:14 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D0603AA2 for ; Thu, 27 Jul 2023 18:11:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=YwjMXrlmohJGv2d3xIQLvbpFtXYP5IQTL3JwTffYMDA=; b=EwbfeJbCiIw4QA0xQjzThFoSr0 6eKHGBru1loTNamc8QCaBjrbnUHnu7Y93ONZX7/EogQq0O885sMVeuCVdepPcvRBu2ESeVYioLUrz klK1hzwcY8Wi3pbmVQR/XZokDBLghppr6ZTUA7I0Aybs3nhfsSwZEaLebP5UUVX1/eiMHrO5xaY7w vbg+Dm0HTf+lHauiwg3wbYb3gC660RMjuQhZ2ylDLBP2D5U5xMZoSGeivUdo6WNgVJXXJrA190EyQ i3+zO/sRORFqPrJK56srKfyk3yVnRa3ZlA86fVrgL2iOBiRab+Yif+JhOJyAPo6RX2cb8jwKnNKGK BUUiP4bQ==; Received: from [2601:1c2:980:9ec0::2764] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qPC0m-0016RS-2e; Fri, 28 Jul 2023 01:11:20 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Jiri Kosina , x86@kernel.org, Sohil Mehta , Corentin Labbe , Greg Kroah-Hartman Subject: [PATCH v2] x86/APM: drop the duplicate APM_MINOR_DEV macro Date: Thu, 27 Jul 2023 18:11:20 -0700 Message-ID: <20230728011120.759-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772530717049204484 X-GMAIL-MSGID: 1772626200504109073 This source file already includes , which contains the same macro. It doesn't need to be defined here again. Fixes: 874bcd00f520 ("apm-emulation: move APM_MINOR_DEV to include/linux/miscdevice.h") Signed-off-by: Randy Dunlap Cc: Jiri Kosina Cc: x86@kernel.org Cc: Sohil Mehta Cc: Corentin Labbe Cc: Greg Kroah-Hartman Reviewed-by: Sohil Mehta --- v2: change the Fixes: tag (Sohil) arch/x86/kernel/apm_32.c | 6 ------ 1 file changed, 6 deletions(-) diff -- a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c @@ -239,12 +239,6 @@ extern int (*console_blank_hook)(int); #endif /* - * The apm_bios device is one of the misc char devices. - * This is its minor number. - */ -#define APM_MINOR_DEV 134 - -/* * Various options can be changed at boot time as follows: * (We allow underscores for compatibility with the modules code) * apm=on/off enable/disable APM