From patchwork Mon May 22 10:50:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Schnelle X-Patchwork-Id: 97319 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1376304vqo; Mon, 22 May 2023 04:33:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6BJng2mXUDVlA45ENH3vU+yGHdi7nQy1ZKn7ww5o4bmOhlrmxVGySCuIeiZAoba20lkGZk X-Received: by 2002:a17:90b:38d1:b0:250:4618:f8e8 with SMTP id nn17-20020a17090b38d100b002504618f8e8mr9823962pjb.46.1684755199302; Mon, 22 May 2023 04:33:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684755199; cv=none; d=google.com; s=arc-20160816; b=D0jXiqGIGJXch9ot4ynH+YoKi1oqPeEZVpTu1vdjpf3g/6BbDKioMVGEPI5zslc4wv FuQxot0/r9rICh+BKzWoaftpb7RmZQ/8Y7HqExGeX2Eg+73gHV27K/G8lNwKHWCAGDQV 6zn+hM0cH4h5zqX03Zj3fLtil9UxSHfcBqbrBblVqtHCJuevwVoCqB0MFbKWUCGGQl59 2XMRbQkHtu8lS07OlmXmDcVq6qzRlCPX2KPjr91WZmrYHsKlXMsq/tdrf9Suh6n69gS/ HWkO3t5kQFWv4Io1vwIFinQd8HZOy/NYGBwbfKhMpMHLhBvPMni5in49WdbPEi7jiVUQ D/4A== 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=/o0mvy1FoCmClq+I1m5/5yvweuMpKHbPhecSVExpfk4=; b=CAompdMAM+4aRHZuPnoKeJtsJoylUc388Pfzfnheap6z6ZhG+duQXTVLk8EhPYwwqM V7+QBrPGUE5cUAhXkKp7pvoxfcFChtcDl1kp7ck3jpDEw3vjOvuZ3TCW98zF1j0DumVJ kG4n6CkrTOu2aN2KeteMdQ6i59uA4yW6926yr+HZ+GPJrR24dj3OjeuACbvIYl85lzj1 Ukd99kAmXEKy7N4/gPciYCMnarX65YydEuOWUCsW4/hjlvANCKEjau+afqvHWf3uOcTE 1jE9YrMKgDy31FeLvMco+GZmXMkZvKdBLtPa6AA+3pelXPwrGeNNWFcGMjCck8+9Owzq 7seg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b=SF5PV6Xw; 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 j191-20020a6380c8000000b0052c6200e5e1si4500916pgd.649.2023.05.22.04.33.06; Mon, 22 May 2023 04:33:19 -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=SF5PV6Xw; 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 S233141AbjEVK5O (ORCPT + 99 others); Mon, 22 May 2023 06:57:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233155AbjEVKzL (ORCPT ); Mon, 22 May 2023 06:55:11 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37929172C; Mon, 22 May 2023 03:52:14 -0700 (PDT) Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34MApD9K031198; Mon, 22 May 2023 10:51:34 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=/o0mvy1FoCmClq+I1m5/5yvweuMpKHbPhecSVExpfk4=; b=SF5PV6XwbuWy7qyq6l6DaiKuMeE1XtVDxSB84V63fnYflgaT44pgtpQLjpuxXrUCnxAD DntZ8Mhgukf1CQqL8R/U1VX0pT0kUTouRlqvjZRagPWXGoA0+T1t5vjj3fzJ424bQRAx LkVNZqe9hkKrcfrzj7z7wV9W2mh2b9MJlXiJLEFLnJaQIZqQmHZKw+gPW1GLFgKEbFKx QJMAGBR9hkpDuPgwCpkYWKUmYl0C6TayQ9SDk2h3P2LLmhPSe1KR+MxxcYTWvP3Ktj86 3RMEjEGTlQOOmxEqFpdroWUd3tIQZzNZG1NMkhrK2eR/2YtkkO0xkjI+n4qv6AJowzmr mw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qq78bh2ud-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 May 2023 10:51:34 +0000 Received: from m0356517.ppops.net (m0356517.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 34M8lnZq007133; Mon, 22 May 2023 10:51:33 GMT Received: from ppma05fra.de.ibm.com (6c.4a.5195.ip4.static.sl-reverse.com [149.81.74.108]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qq78bh2th-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 May 2023 10:51:33 +0000 Received: from pps.filterd (ppma05fra.de.ibm.com [127.0.0.1]) by ppma05fra.de.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 34M2vlaR017967; Mon, 22 May 2023 10:51:30 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma05fra.de.ibm.com (PPS) with ESMTPS id 3qppbmgrwa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 22 May 2023 10:51:30 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 34MApSkC23069108 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 May 2023 10:51:28 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1745B20040; Mon, 22 May 2023 10:51:28 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B125E2004B; Mon, 22 May 2023 10:51:27 +0000 (GMT) Received: from tuxmaker.boeblingen.de.ibm.com (unknown [9.152.85.9]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 22 May 2023 10:51:27 +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 v5 42/44] watchdog: add HAS_IOPORT dependencies Date: Mon, 22 May 2023 12:50:47 +0200 Message-Id: <20230522105049.1467313-43-schnelle@linux.ibm.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230522105049.1467313-1-schnelle@linux.ibm.com> References: <20230522105049.1467313-1-schnelle@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: Dw28lHGGxNBj7GgPriYYIc-dfRvs4vIb X-Proofpoint-GUID: wl1EfQVzYPAXef9lIXtS1AFoA2p-Q2v_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-22_06,2023-05-22_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 bulkscore=0 malwarescore=0 phishscore=0 impostorscore=0 priorityscore=1501 mlxlogscore=984 adultscore=0 lowpriorityscore=0 clxscore=1015 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305220089 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE 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?1766593867530289316?= X-GMAIL-MSGID: =?utf-8?q?1766593867530289316?= 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: Arnd Bergmann Acked-by: Guenter Roeck Signed-off-by: Niklas Schnelle --- drivers/watchdog/Kconfig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index f22138709bf5..affe25b96cfe 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 @@ -2159,7 +2161,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, @@ -2174,7 +2176,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.