From patchwork Wed Sep 13 11:32:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Abbott X-Patchwork-Id: 139179 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp21713vqi; Wed, 13 Sep 2023 17:31:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGjybvxP0H0nC9MxpreX9dzHNJYTk9x9V3LpapDysWmMWXvGYehAiiBG2LwYJxU+0hA1S/L X-Received: by 2002:a05:6830:1e4c:b0:6b9:ba85:a5fa with SMTP id e12-20020a0568301e4c00b006b9ba85a5famr4691000otj.5.1694651509990; Wed, 13 Sep 2023 17:31:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694651509; cv=none; d=google.com; s=arc-20160816; b=SwC/qtpn5ZSx5/bLW17i67SyYeKdlM+i853eMNUSwBKXZYhqAi7NB4k9wXHM3X335M LyL+8cWdemKbvoyiAcVGodb45eBp52VryAGhSMcPO3FDxICF+Jcd0SizbzKWu3z+5aHb ew6UaM5Yui4R0ux2UwYYACx13ybZV+UmQADdtVojv3AKGsADnZT2HSlS29lWcUSzyXFj +a76Z0F4NR4Cjx9oGbRJ6NJLdvvHEP0jElhBGFWgshElqNPt8v90+AjM6nqr4uWRjIW8 L3W4R6Y3ZC8pZ41prnTzA108aBssduWQghLAnKO250bJe6Rt8vyAQNii/RuvbaAsoZEy gv9Q== 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=CTPhZHDS+6t/WSPXMF+Rs8nHVLk8/TiyKH2sCKxTYcs=; fh=V2IY9JiXP/LhUMpX66+Nr0N3VSfqLapXj8NIppeg0Gk=; b=lV+2OsUstBW7sBIa+pYpd9GEfaixqPwAw8k2akCTcDRKY7Lrw4W34RYHdPnsbBEzxk owQRsspnch4QUxgZJjWFyI/bagfi4K/0Bkcf3zsGBf2XHQYSwprGjCMS/jUKPQaQ82ea ADT2SSWVtyKXThGdfcJuFb3BxqYpCi5ux5ZIQPfKSq+Bz9hJ8ZJW7Xllb1YKWRkAjvuw Df1D36NrQw7/M/cavIuMZTOgGBhfU0wCqy4DElL9kvd+q/KIwHfcOVOV2GMkTlo8FqrF NA/f0Z5/QUSNdNIvyUDDr+bKYy75bvHGbQXX96gSB6vn2kURVekxq86MgkYPYId44+yD /tpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mev.co.uk header.s=20221208-6x11dpa4 header.b=ViWS6DQC; 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 cg8-20020a056a00290800b0068fe810e8a2si356753pfb.185.2023.09.13.17.31.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 17:31:49 -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=ViWS6DQC; 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 79CF5832271E; Wed, 13 Sep 2023 04:33:36 -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 S240394AbjIMLdg (ORCPT + 36 others); Wed, 13 Sep 2023 07:33:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240383AbjIMLdW (ORCPT ); Wed, 13 Sep 2023 07:33:22 -0400 Received: from smtp76.iad3a.emailsrvr.com (smtp76.iad3a.emailsrvr.com [173.203.187.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6672E19B6 for ; Wed, 13 Sep 2023 04:33:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mev.co.uk; s=20221208-6x11dpa4; t=1694604797; bh=x5etE6hQat85RKwGFWa9VifsFJ9wpy5aUmUk22feDXQ=; h=From:To:Subject:Date:From; b=ViWS6DQCImwQ9HDJdVZ3EOMgzeH4MMI4oG0kyo/XIY3bLNxfT3+OT/byNKGoXSazt uATp1Z6Fj+3JEVZloNwoZSmmBFU6wm0tDQlkmBstitw1dRbjeFJI9ZI/bXMPhUiBwy a3n9iNL9oaDV8+Jg65oWVbfQe4tD5QQ327JlPNEI= X-Auth-ID: abbotti@mev.co.uk Received: by smtp26.relay.iad3a.emailsrvr.com (Authenticated sender: abbotti-AT-mev.co.uk) with ESMTPSA id AFEC34245; Wed, 13 Sep 2023 07:33:16 -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 08/13] comedi: ni_labpc_common: Conditionally remove I/O port support Date: Wed, 13 Sep 2023 12:32:42 +0100 Message-Id: <20230913113247.91749-9-abbotti@mev.co.uk> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230913113247.91749-1-abbotti@mev.co.uk> References: <20230913113247.91749-1-abbotti@mev.co.uk> MIME-Version: 1.0 X-Classification-ID: 007ec4bd-2574-475a-9bbd-5a4f93b29aec-9-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:33:36 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776941559609477941 X-GMAIL-MSGID: 1776970901656599901 In a future patch, the port I/O functions (`inb()`, `outb()`, and friends will only be declared in the `HAS_IOPORT` configuration option is enabled. The ni_labpc_common module is used by the ni_labpc module (for ISA cards), the ni_labpc_cs module (for PCMCIA cards), and the ni_labpc_pci module (for PCI cards). The ISA and PCMCIA cards use port I/O and the PCI cards use memory-mapped I/O. Conditionally compile the parts of the module that use the port I/O functions so they are compiled if and only if the `CONFIG_HAS_PORTIO` macro is defined, so that the module can be built if the port I/O functions have not been declared. Cc: Arnd Bergmann Cc: Niklas Schnelle Signed-off-by: Ian Abbott --- drivers/comedi/drivers/ni_labpc_common.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/comedi/drivers/ni_labpc_common.c b/drivers/comedi/drivers/ni_labpc_common.c index 5d5c1d0e9cb6..7170b4e98b5e 100644 --- a/drivers/comedi/drivers/ni_labpc_common.c +++ b/drivers/comedi/drivers/ni_labpc_common.c @@ -78,6 +78,9 @@ static const struct comedi_lrange range_labpc_ao = { * functions that do inb/outb and readb/writeb so we can use * function pointers to decide which to use */ + +#ifdef CONFIG_HAS_PORTIO + static unsigned int labpc_inb(struct comedi_device *dev, unsigned long reg) { return inb(dev->iobase + reg); @@ -89,6 +92,8 @@ static void labpc_outb(struct comedi_device *dev, outb(byte, dev->iobase + reg); } +#endif /* CONFIG_HAS_PORTIO */ + static unsigned int labpc_readb(struct comedi_device *dev, unsigned long reg) { return readb(dev->mmio + reg); @@ -1200,8 +1205,12 @@ int labpc_common_attach(struct comedi_device *dev, devpriv->read_byte = labpc_readb; devpriv->write_byte = labpc_writeb; } else { +#ifdef CONFIG_HAS_PORTIO devpriv->read_byte = labpc_inb; devpriv->write_byte = labpc_outb; +#else + return -ENXIO; +#endif } /* initialize board's command registers */