From patchwork Tue Mar 14 12:12:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Schnelle X-Patchwork-Id: 69578 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1721863wrd; Tue, 14 Mar 2023 05:18:16 -0700 (PDT) X-Google-Smtp-Source: AK7set+LCWckY6MiG7s0kw72HXka8CEm4j7YkNZm5NVvj2Cq3OMrK8UpoI1XTq1jiae2cLLNJXiK X-Received: by 2002:a05:6a20:9146:b0:9d:efbe:52ae with SMTP id x6-20020a056a20914600b0009defbe52aemr36263868pzc.30.1678796295956; Tue, 14 Mar 2023 05:18:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678796295; cv=none; d=google.com; s=arc-20160816; b=EzGRpAEwRw9d2nKrZeUIiiXPUr85mu9zNOLCeRUaCn1OrFmWgz/baQ//uy7NZESFk8 wZgLhYlTEwXnMA2niuGdjql+WBjhrggqu9qh5ZMOTqJPUZCU8AYA6XafSgWvIkNn/T/Q pbDNdiE2LC7kptb3I6BPCV4RXjZCgYkRPQPfUemCsMB2XfhaQn1vHlc6V8tWMRqiFhFx wrEAGRRRBzq+81QVIl7FVU1EOe8oEaM8q/p+h/bWLI7sS2J4cXJuokTJ6bTlRZVjOuj+ 3Z9nmCtItXNkgPZwFmzx5OhP/qp1Nbtv/zpOUfqNVqC3dOyXPzG5tOXlvNRdX98vrhkT q9FQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=O2TuigoThC85MUm+xrTBf7ysRHIcd+HyV6A5mkUeIME=; b=zypsoFcHPmq/gK0CXHGoVM2Y5wgGtwCrKE3zMrbkgkzu9OjuSv9Q+uq9Lrs0Dbi8Vn vnjxyUJE/sS5s2+y5DUT/KQoj89jZLuonx8dK4NNGL9jXnf3PVnEjq4K5CJrApXWn07O l5SM7/9ycthaIHHhfYCG03oGVpM7zv2li5pfEt1xhdcE8YTULPw+k+/Tl3QT0cmSjLEB YB4DsBKiwZRu6yn2uIVNByC5grWiFodcZSUJddZ4UuUW1oShIxfC8SgdJqgrG15UmnNS 1iCAYs4Nu3pE7eJ5eQHG/ehQ4JmhELyJOGRn7CUw7/HhqUsa2MAq/tVa3SI+jLKbdsBk Q2IA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=LeDAZaQl; 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; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k3-20020a632403000000b005020ed55feasi2174126pgk.633.2023.03.14.05.17.59; Tue, 14 Mar 2023 05:18:15 -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=@ibm.com header.s=pp1 header.b=LeDAZaQl; 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; dmarc=pass (p=REJECT sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232088AbjCNMQp (ORCPT + 99 others); Tue, 14 Mar 2023 08:16:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231800AbjCNMPK (ORCPT ); Tue, 14 Mar 2023 08:15:10 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D8C2A188C; Tue, 14 Mar 2023 05:14:15 -0700 (PDT) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32EAj6gl027432; Tue, 14 Mar 2023 12:13:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=O2TuigoThC85MUm+xrTBf7ysRHIcd+HyV6A5mkUeIME=; b=LeDAZaQluRlxyTCw2mZ4Pm7GPA7+0VMWVDRGXyt8MnMVECOTujJa4HS2iJHAMRtxxpZU ekEqf/ycS4n6r8rMugihqhVDyctXF5c/jZFGYtKjStvg/ALegZuegSI/ucjakCRHdZmp k2u8jCKvZJuw5ho/dQdmgiB9kPUKWH0URzYsMNgrJZ811oh9iv7Bp3+AM+WxU/0iEvlW LqSH+gORh6VNaRc8B5qJouLI8JSsdvnArahMc3Qbzdx3LYl9RwoXmUWexGSUi8w9dX4e xX1lKbwySWTEV7aY6oGU2Q/LZbSsrrymTk6Yu6xsg4Kew05yYzDF7umolJ/C1ZFZfRN8 Hw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3panssw8x4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Mar 2023 12:13:02 +0000 Received: from m0098399.ppops.net (m0098399.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 32EBU5l4001811; Tue, 14 Mar 2023 12:13:01 GMT Received: from ppma04ams.nl.ibm.com (63.31.33a9.ip4.static.sl-reverse.com [169.51.49.99]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3panssw8vd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Mar 2023 12:13:01 +0000 Received: from pps.filterd (ppma04ams.nl.ibm.com [127.0.0.1]) by ppma04ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 32E7kqS2028633; Tue, 14 Mar 2023 12:12:58 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma04ams.nl.ibm.com (PPS) with ESMTPS id 3p8h96msn2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Mar 2023 12:12:57 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 32ECCtca62259526 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 14 Mar 2023 12:12:55 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 89ECF2007D; Tue, 14 Mar 2023 12:12:55 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1A6B12007B; Tue, 14 Mar 2023 12:12:55 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 14 Mar 2023 12:12:55 +0000 (GMT) From: Niklas Schnelle To: Arnd Bergmann , Wim Van Sebroeck , Guenter Roeck Cc: Greg Kroah-Hartman , Bjorn Helgaas , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Mauro Carvalho Chehab , Alan Stern , "Rafael J. Wysocki" , Geert Uytterhoeven , Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-pci@vger.kernel.org, Arnd Bergmann , linux-watchdog@vger.kernel.org Subject: [PATCH v3 36/38] watchdog: add HAS_IOPORT dependencies Date: Tue, 14 Mar 2023 13:12:14 +0100 Message-Id: <20230314121216.413434-37-schnelle@linux.ibm.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230314121216.413434-1-schnelle@linux.ibm.com> References: <20230314121216.413434-1-schnelle@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 4O6iP_YBCAM4s6g7olLFIbnJC6tUU4A- X-Proofpoint-ORIG-GUID: JkZNKnr4AI9zvWdhgJsUOZTfwlhbdCyR X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-14_06,2023-03-14_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1011 malwarescore=0 suspectscore=0 priorityscore=1501 mlxscore=0 bulkscore=0 mlxlogscore=999 adultscore=0 lowpriorityscore=0 spamscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303140103 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760345504968916798?= X-GMAIL-MSGID: =?utf-8?q?1760345504968916798?= In a future patch HAS_IOPORT=n will result in inb()/outb() and friends not being declared. We thus need to add HAS_IOPORT as dependency for those drivers using them. Co-developed-by: Arnd Bergmann Signed-off-by: Niklas Schnelle Acked-by: Guenter Roeck --- drivers/watchdog/Kconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index f0872970daf9..e5d6f886e25d 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -453,6 +453,7 @@ config 21285_WATCHDOG config 977_WATCHDOG tristate "NetWinder WB83C977 watchdog" depends on (FOOTBRIDGE && ARCH_NETWINDER) || (ARM && COMPILE_TEST) + depends on HAS_IOPORT help Say Y here to include support for the WB977 watchdog included in NetWinder machines. Alternatively say M to compile the driver as @@ -1271,6 +1272,7 @@ config ITCO_WDT select WATCHDOG_CORE depends on I2C || I2C=n depends on MFD_INTEL_PMC_BXT || !MFD_INTEL_PMC_BXT + depends on HAS_IOPORT # for I2C_I801 select LPC_ICH if !EXPERT select I2C_I801 if !EXPERT && I2C help @@ -2148,7 +2150,7 @@ comment "PCI-based Watchdog Cards" config PCIPCWATCHDOG tristate "Berkshire Products PCI-PC Watchdog" - depends on PCI + depends on PCI && HAS_IOPORT help This is the driver for the Berkshire Products PCI-PC Watchdog card. This card simply watches your kernel to make sure it doesn't freeze, @@ -2163,7 +2165,7 @@ config PCIPCWATCHDOG config WDTPCI tristate "PCI-WDT500/501 Watchdog timer" - depends on PCI + depends on PCI && HAS_IOPORT help If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.