Received: by 2002:a05:6358:c692:b0:131:369:b2a3 with SMTP id fe18csp1707370rwb; Wed, 26 Jul 2023 17:37:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlFiKL637OubbwfzgH4TOd6REINzPHCJUUuwvfTFSuvrfYSCq0an/q/UK7BjBXJEWM0nVUuH X-Received: by 2002:a05:6402:510a:b0:51e:5898:a23d with SMTP id m10-20020a056402510a00b0051e5898a23dmr737702edd.5.1690418261141; Wed, 26 Jul 2023 17:37:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690418261; cv=none; d=google.com; s=arc-20160816; b=BYkm06oPDL5qa1UvpeXprDhzRWkzvQyfW37Y3rqHhrHIJDnaxyNJd2lbZhN1hJox2N kQgG7LiNPKc77VLb0c25Art/IegoRtfpkwpGofSWfaDBl4Rm8KpF0c53MLNpNlkWiANf Yl9dYNqV8YzLgtEpSBlIRPnlfi4uxXd7/aIgk6Cp0CNk6l54sFrjOMTo4Cnlnuk5j/Iy AtR5fXXIrAzfpmR3lvfwFWMJwnw398+5tmMA7xbyZyO3/8ah32iFfEXK4xasdPEZQ+cE FBiLU4GDTSFbPi0iZAo+j5uz0sRD8EFD5fe5MGc6NR23O+WnJ7KBBJ+wr8T2dsGBE8+Z caFQ== 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=o4y3h13DqwkObDVE8uFly/JudDZ7Hu6hufCHbRpUZRY=; fh=gdUaHFqMvvM8cNtmbrrjyp3Bb0l3FuOTm/oRVhSyoqo=; b=vf8r8gPYt5if2BWlKeHn5X5g1doy9KIEFAWbjdAaY/0A5HtjxvGYXZ63UNRuSuUNAE pyUNri/SWIwFn6HrANgc+ff1atyD0P5MdVwj+im31aytpoWgO0u8NuAvPccr+Z8MMJS2 I/gfpQOG0dTr/HkKXRjOfLkE7FHnVa9RK8N4QvMAcZWLcL8K1DYeZ04B72f+3+kJBUCY E5+JJfcjk8pW7m5RrgwD4tqtAC+WRWlBh64nguaiGZ4LOzv1UH3LDTVUYAmrxE333bQd BfKq75qQl37WgZfVR9iRrwvJHdUuwjrRBMm1Bmc8NJAX2K4gkvZWuc1AtalslJuXcmtT lpUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=svZOQRP3; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a18-20020aa7cf12000000b0052230def6ffsi69601edy.234.2023.07.26.17.37.16; Wed, 26 Jul 2023 17:37:41 -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=svZOQRP3; 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 S231215AbjGZXtN (ORCPT + 99 others); Wed, 26 Jul 2023 19:49:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230182AbjGZXtM (ORCPT ); Wed, 26 Jul 2023 19:49:12 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 782C2E0 for ; Wed, 26 Jul 2023 16:49:11 -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=o4y3h13DqwkObDVE8uFly/JudDZ7Hu6hufCHbRpUZRY=; b=svZOQRP3b5N7hdQtIEFYu5nyfd 5ilogn+EVo7SXOTvC6TFP5CCjIvGNKioJCtN7ztJ6PU3QdpWqjTHglYtTKZAPt1NpWba6E/ixTXsk ZjcU/kaTojdFWLclSq/eeVa2eX7mhCPDN9cH2hP/A9c6IydcgqlyeoWLvYTI7uE5tdtf7fy5grybh /s1prHKRLd6ALBj5nzMg4B/uI2TGSNyZg9S1289knmiGolkel18BhnWlEjdTC0AwhojYxCqe27ULD OsnG1rLmkK3an4Dri1VkEcdIZQlGn1xn+jKk34hYLFO6ms0VSm34s1C3H86TM7uAmhjxoAULJ3WML a6G5Hf5w==; 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 1qOoFj-00Bk2s-0a; Wed, 26 Jul 2023 23:49:11 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Jiri Kosina , x86@kernel.org Subject: [PATCH] x86/APM: drop the duplicate APM_MINOR_DEV macro Date: Wed, 26 Jul 2023 16:49:10 -0700 Message-ID: <20230726234910.14775-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 This source file already includes , which contains the same macro. It doesn't need to be defined here again. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Randy Dunlap Cc: Jiri Kosina Cc: x86@kernel.org --- 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