From patchwork Mon Mar 25 06:04:16 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: 10867927 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 D499F13B5 for ; Mon, 25 Mar 2019 06:03:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BCF3F291CF for ; Mon, 25 Mar 2019 06:03:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B12EE291D4; Mon, 25 Mar 2019 06:03:33 +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=unavailable 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 5DA8B291CF for ; Mon, 25 Mar 2019 06:03:33 +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=J1u7iZz3Dz0fhr 0pdw468TBjk7O0kwl+7Pw+ugPY/0cfofoLMvyjJFta3sAdzFEihWzzGUbM0ELqQrvKoIGO/rzrIwR /caG2vnXsQwIMgjdJApFwn52Hechv7KWS6yrzRvyVTD/41LeVuEBxaVZhx3aMDbRDT7c1h96OkEa2 wt5MkpJaN8rhES/cBoxwIDw4F5wvMwd3Yk/JM17Vxr7/7EA6ccOkkXF9GfZrKp6SbFwNpxFDrW8jM /01Qzw+QeL9lnEU47IfDY/2Lot3rGsFTVzSIti9plqlC0QsYxpqzXyH94XfPffU0Vl/QyLGGufxdG fB9SgomCzGLQDQnKpvkQ==; 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 1h8Ihn-0003rV-0O; Mon, 25 Mar 2019 06:03:31 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h8Ihd-0003mO-T7 for linux-arm-kernel@lists.infradead.org; Mon, 25 Mar 2019 06:03:29 +0000 Received: by mail-pf1-x441.google.com with SMTP id r15so5589193pfn.9 for ; Sun, 24 Mar 2019 23:03:21 -0700 (PDT) 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=t7dheYot/to1cOshyBqUFiWKdlK6zUPa2kZgUX9ri9YieAOtQx1M8ljQ2y3F+hlMw+ yZktELnPYVjXjOcQXYhLtjLZvN+Cn+FsSbX0mShwzls2Gkbd0YX0NGM7Ki1+k/6CFeET xmwsMxRzJP1jgzh9y1V0BjDNqkvJb/RRlBtlGEiWuzXqEpF6F0jX9PMjfRQvITS4Ad5Z JeKOn3E3NcAehXBJ417LE51vyin7ympkxi1bkxRCleUe4yF3Y5dYrqxV5Gt4JWroLbgq roCPv0N2VH0J0+FB+tJ3BY3TlWezPpCQTkQ/wlr5TQd4vTwChfvs+GR0g1E2T5j6zqee TU7A== 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=tOJ0rRWmwg4kKaXZO3Xf3sccWibV2EyFEIjtyg/H/OFtpalEke6R1RM89iBkmV9jRd bOXhb7QvrJjLp+bnoyjiHUpVTW2tt+SudYwV4ik3Hu5DbEMvcEwrooIqmBW7h3uIYE57 zMIEjkWFxTIaliX6swhbzcHSfrfKoMF6NvYms5aCpWWfhxOgJHJv5VKPUyoNCnHWs19k IPQHxx1ZHSAT4bQ+QXLvUuaUt8lIMUggACuKUDwgPUkVnQW1vYSHruz6k4v4eotFR8VY 3g9iTpOUbKk2ub2VyNm6HrEbtRGQ7gtK15pXCBEfGAPoLkaGD3L05T+1h67HKRgGa/yQ B4Eg== X-Gm-Message-State: APjAAAUBzuxDiEyULjcUlKG9ZZ92mmWnOLvc22hygzrSWAjldCd5pgEb hAl4CpxIug55fR4mVJ/FI9s= X-Google-Smtp-Source: APXvYqw5waGrSLHDsnc18OzsVFHqn2mGhg5skjMtoDXJZ7lHdplfgjMSLhEk0lD7XRiX2TDJzbP8AQ== X-Received: by 2002:a17:902:2d01:: with SMTP id o1mr23638429plb.155.1553493801272; Sun, 24 Mar 2019 23:03:21 -0700 (PDT) Received: from localhost.localdomain ([2001:268:c0a5:e068:c70:4af9:86e2:2]) by smtp.gmail.com with ESMTPSA id i22sm19433145pfa.88.2019.03.24.23.03.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Mar 2019 23:03:20 -0700 (PDT) From: William Breathitt Gray To: linus.walleij@linaro.org, bgolaszewski@baylibre.com Subject: [PATCH v11 04/11] gpio: 104-idi-48: Utilize for_each_set_clump8 macro Date: Mon, 25 Mar 2019 15:04:16 +0900 Message-Id: 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-20190324_230322_108954_9BEA9F56 X-CRM114-Status: GOOD ( 14.01 ) 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, preid@electromag.com.au, yamada.masahiro@socionext.com, linux-pm@vger.kernel.org, linux@rasmusvillemoes.dk, linux-kernel@vger.kernel.org, William Breathitt Gray , linux-gpio@vger.kernel.org, geert@linux-m68k.org, 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;