From patchwork Sun Mar 3 07:49:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Breathitt Gray X-Patchwork-Id: 10836989 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5E0A41575 for ; Sun, 3 Mar 2019 07:49:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A3D82A089 for ; Sun, 3 Mar 2019 07:49:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E99F2A107; Sun, 3 Mar 2019 07:49:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 19EDE2A089 for ; Sun, 3 Mar 2019 07:49:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mKZJ1IaY7GlXT9kvyDtjHSZohYXBb+bquG+//QQEco4=; b=TsZQgsOaMoC5Vm +Udu95DnKUhoCt1y+nPMln5iCxcNQxFD5a0OJgV5KGoCWuC2bR3kONdfRkXYHIo3h3urbt3udnWO7 0Iwom+fllha5lWUlpUsBTO4z7hvP3vYT9iP9jQ74Os+8mDzuYYldoBLYEch2uEWo5JAxgeCsWK51/ FC7V8K8gmz304BerDTpIb9fiSLkuBt0H/GFYxUfzktAX8fgNsZgmbkVvac/HVI43qBCX+Dant+F6W 5msrtQLMFaybp7ZI4daVj9vQ+Vw77+xhVPrzYPzNC5VzpHitGWqh1xXU102y0j3fJqyVMi83QMBa/ ptMUdZcpPobEFD7FdUjg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h0Lrk-0000cs-DG; Sun, 03 Mar 2019 07:48:56 +0000 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h0Lrg-0000c0-P9 for linux-arm-kernel@lists.infradead.org; Sun, 03 Mar 2019 07:48:54 +0000 Received: by mail-pl1-x643.google.com with SMTP id r14so1009026pls.12 for ; Sat, 02 Mar 2019 23:48:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wovyItwhuu6up6N9d5xqiEvzR3TkCWii5hwPk2X/3Vc=; b=eXiKnpZevNwmTcamVOu5dvTkOTzeJHUS3N7oxCh6oN/eUC/IOXFVHczGOZY8H2SvOW viPL4N0S1C/g4As1/2iqAQTqsfv+d38J4qd3qqdWMFDk6Xbbvkii2F6HjFpYNY2aBnbc jZCgn1XWouMsQvMbdAE7gO78LifKT8C128YaA2pZRvmWBFUflqzJJgrreU/EkDQDlMQM c5G/rnuEjk4PYxWPYI6E8O2ev2mU81LWbY9xRTKq+8TcBVcwsV+ZS4u5ElX5KG1l8qBl ABtV0SlWBwBrSGS1td16eDdY8vmaunw9R0S/coPVgaGvVAyWmTB6qRMTVHWey87B/57Q r+UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wovyItwhuu6up6N9d5xqiEvzR3TkCWii5hwPk2X/3Vc=; b=gUboPV5ARUC0DVhyc9vT4ALE3lIoxQbOuMTt+T0fchLuYRIb0vCh6KDcLdyRONLKmN XsGRSEEpFDN3grgP0xnPVHwRuoogdhOBhJCrRfwtLJvfqBYdmu1uUhdgsmrQB3ABaXY5 OiCn57K1ojUgTwueYW6LHvjpXM994fFKYJ+OWdgKTjAU9pvEfwo14YiAAzFtXJbqK1Wq L2mrzjZSvyrRriwcPzRPQXLDMt/9gXwmkSVqhnw2YL/teHw0bSSispgA6EtQVlZg9qvq my3wahqvt57FpHkXcIZMKF4hb7VcbyjRg7o5jbu59rTslJpvOBU3R6FEfAUgPySS/2G3 R7Ug== X-Gm-Message-State: APjAAAU6DCDE/oO2Ps2wcjj5cLlxQ7xEnJcs6htDPKZuum6BCzUYLfDE xdV7n3kRCxfoZGNeX6+Dby0= X-Google-Smtp-Source: APXvYqxKvXnNRkzJ3XKz8Dvb0TZTczUrUD0RwTzhdC44b8wCEU11Ii75h7s7ilHi/hAKi8sdJSYEVg== X-Received: by 2002:a17:902:a414:: with SMTP id p20mr13908371plq.289.1551599332376; Sat, 02 Mar 2019 23:48:52 -0800 (PST) Received: from localhost.localdomain ([2001:268:c0a5:3b5c:c70:4af9:86e2:2]) by smtp.gmail.com with ESMTPSA id f125sm4464483pfc.91.2019.03.02.23.48.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Mar 2019 23:48:51 -0800 (PST) From: William Breathitt Gray To: linus.walleij@linaro.org Subject: [PATCH v9 4/9] gpio: 104-idi-48: Utilize for_each_set_clump8 macro Date: Sun, 3 Mar 2019 16:49:39 +0900 Message-Id: <1292b15bc62e72d01d45e60fbd33a4da850fa2d5.1551598603.git.vilhelm.gray@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190302_234852_814120_3385229B X-CRM114-Status: GOOD ( 14.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch@vger.kernel.org, yamada.masahiro@socionext.com, linux@rasmusvillemoes.dk, linux-kernel@vger.kernel.org, William Breathitt Gray , linux-gpio@vger.kernel.org, bgolaszewski@baylibre.com, akpm@linux-foundation.org, andriy.shevchenko@linux.intel.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Replace verbose implementation in get_multiple/set_multiple callbacks with for_each_set_clump8 macro to simplify code and improve clarity. Reviewed-by: Linus Walleij Signed-off-by: William Breathitt Gray --- drivers/gpio/gpio-104-idi-48.c | 37 ++++++++-------------------------- 1 file changed, 8 insertions(+), 29 deletions(-) diff --git a/drivers/gpio/gpio-104-idi-48.c b/drivers/gpio/gpio-104-idi-48.c index 88dc6f2449f6..59c571aecf9a 100644 --- a/drivers/gpio/gpio-104-idi-48.c +++ b/drivers/gpio/gpio-104-idi-48.c @@ -93,42 +93,21 @@ static int idi_48_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask, unsigned long *bits) { struct idi_48_gpio *const idi48gpio = gpiochip_get_data(chip); - size_t i; + unsigned int offset; + unsigned long gpio_mask; static const size_t ports[] = { 0, 1, 2, 4, 5, 6 }; - const unsigned int gpio_reg_size = 8; - unsigned int bits_offset; - size_t word_index; - unsigned int word_offset; - unsigned long word_mask; - const unsigned long port_mask = GENMASK(gpio_reg_size - 1, 0); + const unsigned int ngpio = ARRAY_SIZE(ports) * 8; + unsigned int port_addr; unsigned long port_state; /* clear bits array to a clean slate */ bitmap_zero(bits, chip->ngpio); - /* get bits are evaluated a gpio port register at a time */ - for (i = 0; i < ARRAY_SIZE(ports); i++) { - /* gpio offset in bits array */ - bits_offset = i * gpio_reg_size; + for_each_set_clump8(offset, gpio_mask, mask, ngpio) { + port_addr = idi48gpio->base + ports[offset / 8]; + port_state = inb(port_addr) & gpio_mask; - /* word index for bits array */ - word_index = BIT_WORD(bits_offset); - - /* gpio offset within current word of bits array */ - word_offset = bits_offset % BITS_PER_LONG; - - /* mask of get bits for current gpio within current word */ - word_mask = mask[word_index] & (port_mask << word_offset); - if (!word_mask) { - /* no get bits in this port so skip to next one */ - continue; - } - - /* read bits from current gpio port */ - port_state = inb(idi48gpio->base + ports[i]); - - /* store acquired bits at respective bits array offset */ - bits[word_index] |= (port_state << word_offset) & word_mask; + bitmap_set_value8(bits, ngpio, port_state, offset); } return 0;