From patchwork Wed Sep 13 11:32:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Abbott X-Patchwork-Id: 13913 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1112489vqx; Wed, 13 Sep 2023 07:09:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGVGUVT/XzV6ajk2BaPgccajDfH+89EYWKkSioornmd4+QiMIyza+1gxF5jwxB2xGDiax0d X-Received: by 2002:a05:6870:9107:b0:1c1:12dc:70b1 with SMTP id o7-20020a056870910700b001c112dc70b1mr2902224oae.57.1694614159195; Wed, 13 Sep 2023 07:09:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614159; cv=none; d=google.com; s=arc-20160816; b=rXz9IjSZ6xQbaD3u2AQ6zCEZngE6yiIZn72bHjdMwvgiPaGeaFhrNWeqObj7kWgzz7 zfI4wdN5OD3+mtyg/8EduS1Rp/iZv/Dw9ebycX0HhCKlA5iKnTMTozKQtafDflUzajzo P6q1GYpYYYRjeViiHH9EnnyAQ6WZSSzKfcIi8bExn1/7zUAfKQUWF0cM5LixTVhasN5Y X+dcBV8GRct7tf6LNtAqd0uZxgjPRTR54lkDW5ruzc9b41NB5EjCGEILY6rj8muJXCFo EgDA+yP/11lHsXfmWGHWrOb06hC8kQXGKBqAx3octUTc5wjXxAQeapSVt2NLyQO9k9PD Q3rA== 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=LXU9tGX5IWZhSAvz3/+h9Xj9+HoJqTdHnNXxOoMwVPw=; fh=V2IY9JiXP/LhUMpX66+Nr0N3VSfqLapXj8NIppeg0Gk=; b=l1+Utq5Xc2q41W9RBgzSugMYzl+1G2Ika0z8Tqmd1WRHwVsG7HcANe1zkqu6TiNlNB plwBpEiJ2bd3JQyRaffs6fBPJyWn9BBcDCyhVG/lMOpkd6EfImn3pK3VAmxvdA5BoeOc YKxG44r/8Jl8yROMipqEo70PZFAxLesVcEpCZYGbsbEo5eUljwt46HHye/XEIRkJN1WY gAGvxXsWNk7qBnMM/1UiCP9+VQjzP6SPJ7X1TYy3zmOHPI1DDiWmHZ62GtwLijTFl4FP is1TTcIf/OHcGQid/DXJ2sfnJu+/MgQdQqYb2hD5sJB1w5X3faU99XJ/3sNk8qxjWws2 M9Sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mev.co.uk header.s=20221208-6x11dpa4 header.b=UWEWIc+D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=mev.co.uk Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id b19-20020a63cf53000000b00565dd91aa06si10007428pgj.244.2023.09.13.07.09.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:09:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@mev.co.uk header.s=20221208-6x11dpa4 header.b=UWEWIc+D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=mev.co.uk Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 4893781B17DE; Wed, 13 Sep 2023 04:33:54 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240292AbjIMLdM (ORCPT + 36 others); Wed, 13 Sep 2023 07:33:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240228AbjIMLdL (ORCPT ); Wed, 13 Sep 2023 07:33:11 -0400 Received: from smtp79.iad3a.emailsrvr.com (smtp79.iad3a.emailsrvr.com [173.203.187.79]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86F7F1726 for ; Wed, 13 Sep 2023 04:33:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mev.co.uk; s=20221208-6x11dpa4; t=1694604786; bh=hUYLbi78Qa+jZFtXd5qiHGqehzQ1duESeMREUGbRFgs=; h=From:To:Subject:Date:From; b=UWEWIc+DZBmKpahPtbE/J9ROxLOy3414GAM/mAa3P3n0xwfIz2bvxaoq+JK3HP0ED uvCp0MvVdP0bk+oNCnylDGLJqaK+nX3esetUi0mIkkdB9jjSKTpifSJMc/Aib0WEhE oRAvEv9rW1vmUj63YJbdpCaKpvupVaAu09/5wlHc= X-Auth-ID: abbotti@mev.co.uk Received: by smtp26.relay.iad3a.emailsrvr.com (Authenticated sender: abbotti-AT-mev.co.uk) with ESMTPSA id A13363B54; Wed, 13 Sep 2023 07:33:05 -0400 (EDT) From: Ian Abbott To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Ian Abbott , H Hartley Sweeten , Arnd Bergmann , Niklas Schnelle Subject: [PATCH 00/13] comedi: Re-do HAS_IOPORT dependencies Date: Wed, 13 Sep 2023 12:32:34 +0100 Message-Id: <20230913113247.91749-1-abbotti@mev.co.uk> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Classification-ID: 007ec4bd-2574-475a-9bbd-5a4f93b29aec-1-1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Wed, 13 Sep 2023 04:33:54 -0700 (PDT) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776931736755911667 X-GMAIL-MSGID: 1776931736755911667 [Reposting because I omitted some Cc: email headers. The patches are identical, only the email headers have changed. Sorry for the inconvenience. - Ian Abbott] Commit b5c75b68b7de ("comedi: add HAS_IOPORT dependencies") was reverted because it made it impossible to select configuration options that depend on the COMEDI_8254, COMEDI_DAS08, COMEDI_NI_LABPC, or COMEDI_AMPLC_DIO200 options due to changing 'select' directives to 'depends on' directives and there being no other way to select those codependent configuration options. This patch series conditionally removes port I/O support from various comedi modules so they still be built when a future patch removes the port I/O functions (inb(), outb() and friends) unless the HAS_IOPORT configuration option is selected. The final patch 13 adds HAS_IOPORT dependencies to the configuration options as in the reverted patch, but there are now fewer options that need to depend on HAS_IOPORT, and the 'select' directives have not been replaced with 'depends on' directives. 01) comedi: Correct dependencies for COMEDI_NI_PCIDIO 02) comedi: comedi_8254: Use a call-back function for register access 03) comedi: comedi_8254: Replace comedi_8254_init() and comedi_8254_mm_init() 04) comedi: comedi_8254: Conditionally remove I/O port support 05) comedi: 8255_pci: Conditionally remove devices that use port I/O 06) comedi: comedi_8255: Rework subdevice initialization functions 07) comedi: comedi_8255: Conditionally remove I/O port support 08) comedi: ni_labpc_common: Conditionally remove I/O port support 09) comedi: ni_mio_common: Conditionally use I/O port or MMIO 10) comedi: amplc_dio200_pci: Conditionally remove devices that use port I/O 11) comedi: amplc_dio200_common: Refactor register access functions 12) comedi: amplc_dio200_common: Conditionally remove I/O port support 13) comedi: add HAS_IOPORT dependencies again drivers/comedi/Kconfig | 45 +++++- drivers/comedi/drivers.c | 3 +- drivers/comedi/drivers/8255.c | 2 +- drivers/comedi/drivers/8255_pci.c | 15 +- drivers/comedi/drivers/adl_pci9111.c | 8 +- drivers/comedi/drivers/adl_pci9118.c | 8 +- drivers/comedi/drivers/adv_pci1710.c | 8 +- drivers/comedi/drivers/adv_pci_dio.c | 14 +- drivers/comedi/drivers/aio_aio12_8.c | 10 +- drivers/comedi/drivers/amplc_dio200_common.c | 104 +++++++++--- drivers/comedi/drivers/amplc_dio200_pci.c | 12 +- drivers/comedi/drivers/amplc_pc236_common.c | 2 +- drivers/comedi/drivers/amplc_pci224.c | 8 +- drivers/comedi/drivers/amplc_pci230.c | 10 +- drivers/comedi/drivers/cb_das16_cs.c | 8 +- drivers/comedi/drivers/cb_pcidas.c | 23 +-- drivers/comedi/drivers/cb_pcidas64.c | 7 +- drivers/comedi/drivers/cb_pcidda.c | 2 +- drivers/comedi/drivers/cb_pcimdas.c | 12 +- drivers/comedi/drivers/cb_pcimdda.c | 2 +- drivers/comedi/drivers/comedi_8254.c | 234 ++++++++++++++++++--------- drivers/comedi/drivers/comedi_8255.c | 123 +++++++------- drivers/comedi/drivers/daqboard2000.c | 4 +- drivers/comedi/drivers/das08.c | 11 +- drivers/comedi/drivers/das16.c | 10 +- drivers/comedi/drivers/das16m1.c | 22 +-- drivers/comedi/drivers/das1800.c | 8 +- drivers/comedi/drivers/das6402.c | 8 +- drivers/comedi/drivers/das800.c | 8 +- drivers/comedi/drivers/dmm32at.c | 3 +- drivers/comedi/drivers/me4000.c | 6 +- drivers/comedi/drivers/ni_at_a2150.c | 8 +- drivers/comedi/drivers/ni_at_ao.c | 8 +- drivers/comedi/drivers/ni_atmio16d.c | 2 +- drivers/comedi/drivers/ni_daq_dio24.c | 2 +- drivers/comedi/drivers/ni_labpc_common.c | 51 +++--- drivers/comedi/drivers/ni_mio_common.c | 74 ++++++--- drivers/comedi/drivers/pcl711.c | 8 +- drivers/comedi/drivers/pcl724.c | 6 +- drivers/comedi/drivers/pcl812.c | 10 +- drivers/comedi/drivers/pcl816.c | 8 +- drivers/comedi/drivers/pcl818.c | 8 +- drivers/comedi/drivers/pcm3724.c | 2 +- drivers/comedi/drivers/rtd520.c | 6 +- include/linux/comedi/comedi_8254.h | 51 ++++-- include/linux/comedi/comedi_8255.h | 24 ++- 46 files changed, 649 insertions(+), 359 deletions(-)