From patchwork Sat Jan 12 01:49:41 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: 1023838 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GYToRQse"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43c2hp6cy2z9sDn for ; Sat, 12 Jan 2019 12:49:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726418AbfALBtG (ORCPT ); Fri, 11 Jan 2019 20:49:06 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:41610 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726227AbfALBtG (ORCPT ); Fri, 11 Jan 2019 20:49:06 -0500 Received: by mail-pg1-f193.google.com with SMTP id m1so7048086pgq.8; Fri, 11 Jan 2019 17:49:05 -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=lWYabFVT2N9Pm4UFPqAjVCH7x7Uil0K2CYo2zNlIxxg=; b=GYToRQseVhD5lZ1KnIs4C6hTA6wVbzAOXMogWlGw6QLGXl0xMyu2E8nb5L05+a3Gwb 7H6WRX1EFy74XDXSh24uqlf3XdUZhLTRDMypGJmaLpvhi3FEh89OQKx8DpjbIw27TZ7/ H/96YoTFFE7RcYsVAP7zZ6mYl27LBl27ZD4+m+scns9aDC+U1P6KpcET/UAFFT4KCqWX P70v7EXhvmSJTTTCBD7jVIiEKQBFnzgpmEa2CKhGQPU9PzhdkZ3Wurc4QSiEuIu3W9iu AQljyyFG/hHKdien4X/fBBMJlpw/64KwGk6ryqYK/C7KofLI+fGEquWKmz1eabrJoFWX 15+Q== 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=lWYabFVT2N9Pm4UFPqAjVCH7x7Uil0K2CYo2zNlIxxg=; b=fJjNOO62xbNJGepMiT7tzR2JQbzJnpK5I6zOZetBvUYFo/t1gU7Lvnj/ZQwUnUoZDS e5jTp7pw5PSxZvI8P3nAHZplBBIX6H4dfFmTaCJ8+2Uh5CbfMYuo4QUt49Ot5/OE5Zye +fTpLaDqhfPYXgitnFKlI1g8CeHPymwjh11PX8FZoleSdnq/uoXvUJLXi/CYRyPyNaB8 lQ7mo42WC7dSN9wZDVGdjDt2lbIjk5D0evBTciPrjL9PtY6l5dwIZTfmLqq5aSRsba38 NP5lW/VFH1s5W9aS8glSrvip1WuJouRngeFBOLrkkRmyjAKafMg43KAyH03fKOgN8wW3 fBHA== X-Gm-Message-State: AJcUukdyMRFbwyc61gGBlew4c3y+aPGGYKO2tHRHSa7HrzWr9VlMDGgd 0H41uWBi4tRTBjeOYUqbzINDBaj3 X-Google-Smtp-Source: ALg8bN6lNkqtn2MZtn6UfD6T/12+OQWvO1zORFjIZ1LXe8gQvIE1fsyPPuT59S8tWU/xiWpzykwe7w== X-Received: by 2002:a63:554b:: with SMTP id f11mr13558256pgm.37.1547257745112; Fri, 11 Jan 2019 17:49:05 -0800 (PST) Received: from localhost.localdomain ([2001:268:c0a3:ffc5:36e2:bccb:ba63:9e84]) by smtp.gmail.com with ESMTPSA id w184sm90638299pgd.34.2019.01.11.17.49.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 17:49:04 -0800 (PST) From: William Breathitt Gray To: linus.walleij@linaro.org Cc: akpm@linux-foundation.org, linux-gpio@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, andriy.shevchenko@linux.intel.com, linux@rasmusvillemoes.dk, William Breathitt Gray Subject: [PATCH v7 6/8] gpio: ws16c48: Utilize for_each_set_clump8 macro Date: Sat, 12 Jan 2019 10:49:41 +0900 Message-Id: <5c530526bc8c55c83dc3c47abee5129bda3e41db.1547257386.git.vilhelm.gray@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Replace verbose implementation in get_multiple/set_multiple callbacks with for_each_set_clump8 macro to simplify code and improve clarity. Signed-off-by: William Breathitt Gray --- drivers/gpio/gpio-ws16c48.c | 71 ++++++++++--------------------------- 1 file changed, 19 insertions(+), 52 deletions(-) diff --git a/drivers/gpio/gpio-ws16c48.c b/drivers/gpio/gpio-ws16c48.c index 5cf3697bfb15..48cb9aa740b5 100644 --- a/drivers/gpio/gpio-ws16c48.c +++ b/drivers/gpio/gpio-ws16c48.c @@ -134,42 +134,19 @@ static int ws16c48_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask, unsigned long *bits) { struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip); - const unsigned int gpio_reg_size = 8; - size_t i; - const size_t num_ports = chip->ngpio / gpio_reg_size; - 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); + unsigned int offset; + unsigned long gpio_mask; + 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 < num_ports; i++) { - /* gpio offset in bits array */ - bits_offset = i * gpio_reg_size; + for_each_set_clump8(offset, gpio_mask, mask, chip->ngpio) { + port_addr = ws16c48gpio->base + 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(ws16c48gpio->base + i); - - /* store acquired bits at respective bits array offset */ - bits[word_index] |= (port_state << word_offset) & word_mask; + bitmap_set_value8(bits, port_state, offset); } return 0; @@ -203,39 +180,29 @@ static void ws16c48_gpio_set_multiple(struct gpio_chip *chip, unsigned long *mask, unsigned long *bits) { struct ws16c48_gpio *const ws16c48gpio = gpiochip_get_data(chip); - unsigned int i; - const unsigned int gpio_reg_size = 8; - unsigned int port; - unsigned int iomask; + unsigned int offset; + unsigned long gpio_mask; + size_t index; + unsigned int port_addr; unsigned int bitmask; unsigned long flags; - /* set bits are evaluated a gpio register size at a time */ - for (i = 0; i < chip->ngpio; i += gpio_reg_size) { - /* no more set bits in this mask word; skip to the next word */ - if (!mask[BIT_WORD(i)]) { - i = (BIT_WORD(i) + 1) * BITS_PER_LONG - gpio_reg_size; - continue; - } - - port = i / gpio_reg_size; + for_each_set_clump8(offset, gpio_mask, mask, chip->ngpio) { + index = offset / 8; + port_addr = ws16c48gpio->base + index; /* mask out GPIO configured for input */ - iomask = mask[BIT_WORD(i)] & ~ws16c48gpio->io_state[port]; - bitmask = iomask & bits[BIT_WORD(i)]; + gpio_mask &= ~ws16c48gpio->io_state[index]; + bitmask = bitmap_get_value8(bits, offset) & gpio_mask; raw_spin_lock_irqsave(&ws16c48gpio->lock, flags); /* update output state data and set device gpio register */ - ws16c48gpio->out_state[port] &= ~iomask; - ws16c48gpio->out_state[port] |= bitmask; - outb(ws16c48gpio->out_state[port], ws16c48gpio->base + port); + ws16c48gpio->out_state[index] &= ~gpio_mask; + ws16c48gpio->out_state[index] |= bitmask; + outb(ws16c48gpio->out_state[index], port_addr); raw_spin_unlock_irqrestore(&ws16c48gpio->lock, flags); - - /* prepare for next gpio register set */ - mask[BIT_WORD(i)] >>= gpio_reg_size; - bits[BIT_WORD(i)] >>= gpio_reg_size; } }