From patchwork Wed Sep 13 11:20:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Abbott X-Patchwork-Id: 13922 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1210538vqx; Wed, 13 Sep 2023 09:35:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFyudv5naJtybIXXe6BqL3QQ+5s5/14DOQ1L9VU6OSaRdHWF0dK2I1utCD4HPmpcB+cSoKK X-Received: by 2002:a05:6871:609:b0:1c8:bf19:e1db with SMTP id w9-20020a056871060900b001c8bf19e1dbmr3549325oan.11.1694622951138; Wed, 13 Sep 2023 09:35:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694622951; cv=none; d=google.com; s=arc-20160816; b=q0509mrXvmrofXOJczJ7bbgOwk/oIcDPWB3T86cyrfmZaLF85XU3sQ572mP79Y7S0C Ky0gkNo9HFPhbvO2ax+2C8uKpctXF/jVJ+fSQjTxUU8ft69xzIpeT1RHLzRe4DK9w7Mw AVtbU2NMdSrAz2ulNSlAOBj3CyTJ445EBHA1K6QWSat7Bxe+aBmDmZclqgxBTevO0oS0 7ITAZZ+tKdT/WwWdvODmoZOaMUTYjwi6xB/X5LJenLGK6tvkhZb/twWfIJKFcLZgcy21 TxpgMFxTlZUberuvMpv6Rbp8s4Hj/rPi0a4iDgOEPLz9zK8Yz5CBtJKR2zMqk3+pYLAS iRFw== 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=gN+1GCE1+9SUm2LoygzXPioS1luhKKsJOWYHyXXW+tA=; fh=9ZqY2ea+fJtxz0uwSMEenRKri0eRIny1MqtUqsL0BD4=; b=bxa2Yaome24Jikmn7X6XZfZBnGcYugRh7bypwjCgbqDNXXMU7IwXKhXtgyvmeI/nen B/cYdZtfF9dXJRwmXIbDRemAHIXcIRWrqgiEIOUhfjsAOy0cfXs38mdL8mVRKfLg71WL 6jTxCUZgZe36pegpBCvSmw5y1mLMCfK89hrKqrh7XF1BzHfrDsQIq5DDQfmiImT2BzS/ Iihd+SThnBUZflwAw7a6Wj7Z2pPoUKnZXxvsHttdCBq9AyoNIy6TxcMGOgh7j+TYkvHj Eq8ny8igySQcuGgGgeKFWwik+cozoOqTUnavX0+0BCdGlocU/ZMRpjPl6fMyy3hhUtCs dlQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mev.co.uk header.s=20221208-6x11dpa4 header.b=H6hHYfKH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id r22-20020a638f56000000b00563e25c07c0si10134149pgn.270.2023.09.13.09.35.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 09:35:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@mev.co.uk header.s=20221208-6x11dpa4 header.b=H6hHYfKH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 46D0580257B3; Wed, 13 Sep 2023 04:20:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239909AbjIMLUy (ORCPT + 36 others); Wed, 13 Sep 2023 07:20:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239864AbjIMLUx (ORCPT ); Wed, 13 Sep 2023 07:20:53 -0400 Received: from smtp108.iad3b.emailsrvr.com (smtp108.iad3b.emailsrvr.com [146.20.161.108]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAA221BD1 for ; Wed, 13 Sep 2023 04:20:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mev.co.uk; s=20221208-6x11dpa4; t=1694604049; bh=2QE/y+ihMfM27V3AweiLu31+YrznzVqxxNO4urLqQxo=; h=From:To:Subject:Date:From; b=H6hHYfKHsFKXnOlcbW10W6Wkk73y04nF+uYkb1nOJgYWGPV5sJzMP/Bj+CtBsSK+j EguZ8HNmyJaaek5m9FCIH59GrBsbhs85izZS9RnsB44oHH38Q2Wk5KbYo992l//K1P knZL4u1CNOyK1bRCXjmW2RcQWHT0DkXE9P8KT5dk= X-Auth-ID: abbotti@mev.co.uk Received: by smtp6.relay.iad3b.emailsrvr.com (Authenticated sender: abbotti-AT-mev.co.uk) with ESMTPSA id 4F279200C0; Wed, 13 Sep 2023 07:20:48 -0400 (EDT) From: Ian Abbott To: linux-kernel@vger.kernel.org Cc: Arnd Bergmann , Niklas Schnelle Subject: [PATCH 00/13] comedi: Re-do HAS_IOPORT dependencies Date: Wed, 13 Sep 2023 12:20:19 +0100 Message-Id: <20230913112032.90618-1-abbotti@mev.co.uk> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Classification-ID: e346d63c-f057-4595-b974-8be9cf32e1c1-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 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 04:20:56 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776931736755911667 X-GMAIL-MSGID: 1776940955558143940 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(-)