From patchwork Tue Mar 14 12:11:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Schnelle X-Patchwork-Id: 69564 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1721277wrd; Tue, 14 Mar 2023 05:17:01 -0700 (PDT) X-Google-Smtp-Source: AK7set+hc2uYcGFrj9IiDYm2Vw7evD55SwfNwTxA/aaU94yuJD3v/+Vo3fWdLRFR8WHnFrItFz0q X-Received: by 2002:a05:6a20:3542:b0:d3:bb4a:a830 with SMTP id f2-20020a056a20354200b000d3bb4aa830mr8882333pze.56.1678796221109; Tue, 14 Mar 2023 05:17:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678796221; cv=none; d=google.com; s=arc-20160816; b=M5Wu4fFiGB7rZizY839WdJOmWxSzNS2AezuGohTT1nMQQ4O3nt9ROtqZJ8hGx8wST8 9t2r+SVR8v00fYUbL5pacKB5oJaI9nwrqYLKhIp07MMlo1m20tJlSAkup2Koo116PXll 8GWXrvM1vszTPsBjEaHbkKZnRaHydojK4KP2Al5IVxIipLMBpJWvqwdA5XKXdA7C3Wx4 Tjim+mZUOyMDicrqhcIqPaIk/afcPKvUxZoFJtDRgW4PBn+2IEQl7ljGMgSPwXtnYD6P MyeRtZD1WhulBUX1FZxTy7qrvaBbVVQpPRNLryG9cDRG1W5a8x7UUh+A/wnNFCFD7pLk WnfA== 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=cw3Hnac9T5XMpvF57L4Nhob9BUYv7xSOWKE0S9ZBQyU=; b=rfCP9UB5yQP6AWZpg58cYf22qKy/HbEO75Z7TN4Y5Mxmau5naE1Rmut/iSj002MBH0 Hlo2nypRxV1x6aFMx6LeKK/W7sR+b0yMf/0cuUWKQxrHvlHVeyv2jZIZMyR2ez10cV8n KBH9WlD8TNxvb0B9U7bke3PMZxhGnGCgE33RrSJ/7cLRqtXmNb+2FAVwZyodoeJeT3H1 SMH99fTWUsdWm0iV2QawSMI6u4Mn1B6F5Y8Z013aHYAkYAiryn+TFto/uDki3Z7jhlHw N+WYR/P3c0QefNT11K6vBZCiFXvSMHAwGOSxVv30aM7zWF1erGl1JVHhXeW5UGHppE5Q fWQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ibm.com header.s=pp1 header.b="g1/lhnv3"; 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 b65-20020a621b44000000b005f27f8698efsi2045801pfb.172.2023.03.14.05.16.41; Tue, 14 Mar 2023 05:17:01 -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="g1/lhnv3"; 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 S231705AbjCNMPJ (ORCPT + 99 others); Tue, 14 Mar 2023 08:15:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231414AbjCNMN5 (ORCPT ); Tue, 14 Mar 2023 08:13:57 -0400 Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 441F37C3E4; Tue, 14 Mar 2023 05:13:04 -0700 (PDT) Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32EBe1rT024111; Tue, 14 Mar 2023 12:12:41 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=cw3Hnac9T5XMpvF57L4Nhob9BUYv7xSOWKE0S9ZBQyU=; b=g1/lhnv3x0D2UiZOrDSXWAHrSpl/UYDuwEFluEhRkm2rT7DzpQdslRZ3J8Acd9XnFDPI tbsAfNstIg6vsnIT2carK3i1jKPxkOgKSvA1IIf0hvPOyCoNxubNcJlVo1ZDbhzjCFyv d0Ro+aDkhmPDJ+G/ZA3NH0pb7d1wNXnGkBPagZGQxtwioKyGtbtgd/gR+5fEGvY9vuYM g+M3+nRPXdYQd/BTGXPfdHHrr6vC13jZtB0nRv4cyR77Vz1E+Skt5JwfvmEOHDd/Kcia utGoZgVxMO9F2VstSXg5qruR4uKxTtyp9TgU9TC/so+d9HLMo47razZkmpa5HtaJT45b SQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3papbac5uv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Mar 2023 12:12:41 +0000 Received: from m0098419.ppops.net (m0098419.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 32EBak0a020629; Tue, 14 Mar 2023 12:12:40 GMT Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0b-001b2d01.pphosted.com (PPS) with ESMTPS id 3papbac5tm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Mar 2023 12:12:40 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 32E6EFmO030078; Tue, 14 Mar 2023 12:12:38 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma06ams.nl.ibm.com (PPS) with ESMTPS id 3p8gwfct6w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 14 Mar 2023 12:12:38 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 32ECCZZX48693856 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 14 Mar 2023 12:12:36 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D2A742007B; Tue, 14 Mar 2023 12:12:35 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 675642007C; Tue, 14 Mar 2023 12:12:35 +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:35 +0000 (GMT) From: Niklas Schnelle To: Arnd Bergmann , Karsten Keil 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 , netdev@vger.kernel.org Subject: [PATCH v3 18/38] mISDN: add HAS_IOPORT dependencies Date: Tue, 14 Mar 2023 13:11:56 +0100 Message-Id: <20230314121216.413434-19-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: d_Qa1fLaSceXZwK9dOPEGyutzMR1VVnQ X-Proofpoint-ORIG-GUID: fJIGx9H3LvvwLKvDh1FbFXE9E-OIdria 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 mlxscore=0 lowpriorityscore=0 impostorscore=0 malwarescore=0 bulkscore=0 spamscore=0 adultscore=0 clxscore=1011 mlxlogscore=844 phishscore=0 suspectscore=0 priorityscore=1501 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,RCVD_IN_MSPIKE_H2,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?1760345426329154174?= X-GMAIL-MSGID: =?utf-8?q?1760345426329154174?= 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. With that the !S390 dependency on ISDN can be removed as all drivers without HAS_IOPORT requirement now build. Co-developed-by: Arnd Bergmann Signed-off-by: Niklas Schnelle Acked-by: Jakub Kicinski --- drivers/isdn/Kconfig | 1 - drivers/isdn/hardware/mISDN/Kconfig | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig index 2690e2c5a158..6fd1b3f84a29 100644 --- a/drivers/isdn/Kconfig +++ b/drivers/isdn/Kconfig @@ -6,7 +6,6 @@ menuconfig ISDN bool "ISDN support" depends on NET && NETDEVICES - depends on !S390 && !UML help ISDN ("Integrated Services Digital Network", called RNIS in France) is a fully digital telephone service that can be used for voice and diff --git a/drivers/isdn/hardware/mISDN/Kconfig b/drivers/isdn/hardware/mISDN/Kconfig index 078eeadf707a..a35bff8a93f5 100644 --- a/drivers/isdn/hardware/mISDN/Kconfig +++ b/drivers/isdn/hardware/mISDN/Kconfig @@ -14,7 +14,7 @@ config MISDN_HFCPCI config MISDN_HFCMULTI tristate "Support for HFC multiport cards (HFC-4S/8S/E1)" - depends on PCI || CPM1 + depends on (PCI || CPM1) && HAS_IOPORT depends on MISDN help Enable support for cards with Cologne Chip AG's HFC multiport @@ -43,7 +43,7 @@ config MISDN_HFCUSB config MISDN_AVMFRITZ tristate "Support for AVM FRITZ!CARD PCI" depends on MISDN - depends on PCI + depends on PCI && HAS_IOPORT select MISDN_IPAC help Enable support for AVMs FRITZ!CARD PCI cards @@ -51,7 +51,7 @@ config MISDN_AVMFRITZ config MISDN_SPEEDFAX tristate "Support for Sedlbauer Speedfax+" depends on MISDN - depends on PCI + depends on PCI && HAS_IOPORT select MISDN_IPAC select MISDN_ISAR help @@ -60,7 +60,7 @@ config MISDN_SPEEDFAX config MISDN_INFINEON tristate "Support for cards with Infineon chipset" depends on MISDN - depends on PCI + depends on PCI && HAS_IOPORT select MISDN_IPAC help Enable support for cards with ISAC + HSCX, IPAC or IPAC-SX @@ -69,14 +69,14 @@ config MISDN_INFINEON config MISDN_W6692 tristate "Support for cards with Winbond 6692" depends on MISDN - depends on PCI + depends on PCI && HAS_IOPORT help Enable support for Winbond 6692 PCI chip based cards. config MISDN_NETJET tristate "Support for NETJet cards" depends on MISDN - depends on PCI + depends on PCI && HAS_IOPORT depends on TTY select MISDN_IPAC select MISDN_HDLC