From patchwork Tue May 8 13:27:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Breathitt Gray X-Patchwork-Id: 910185 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lpGNUHeR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40gKzm5vMrz9s4q for ; Tue, 8 May 2018 23:27:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755216AbeEHN1V (ORCPT ); Tue, 8 May 2018 09:27:21 -0400 Received: from mail-yb0-f194.google.com ([209.85.213.194]:43032 "EHLO mail-yb0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755193AbeEHN1T (ORCPT ); Tue, 8 May 2018 09:27:19 -0400 Received: by mail-yb0-f194.google.com with SMTP id v12-v6so2165846ybl.10; Tue, 08 May 2018 06:27:19 -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; bh=slf1J3iHpjNeA4Hre3fVutRjHc1MIIIvq7nrD4k34rM=; b=lpGNUHeRedhgHozPgIzVjQZkKYFIEX0u15rIFChbLUXL0fq5+6b9OO1mdTT9pag+Gc sXO17T7MSjB6SP0enZqdXo0ohe233bwyWK0LKYzp9lYgi2pGyojYZuLTxmpkXtiaEvTC mDkC/4SznodG1zlIyO7APvbmVkrbVQTmPs6dUHS8yNhjgCCnSo+UCSGD0xGhqp7dxa0v peo5feLV5CZPvxIKA7FyMGWr6TQBzAdNnwiO1Um0ju5tgtYLB2+j2yXr+cylweB3Lk3H QwrzKdXgt8XaBhdpr1bbXxqCy+bRrN+rPFrSmz0dzB7UKt4p/SEe3v6Eu0RXj0upN/iZ pVTA== 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; bh=slf1J3iHpjNeA4Hre3fVutRjHc1MIIIvq7nrD4k34rM=; b=s2oN+tx25RznLZmFGLZXfFRHkt34ckNviGdpmCc2/5vxqODkWJWlN9M01wis5kmsm9 IMZNRVp0jPt56DybbKEyvGmjczRdwndydOywI5sfBC+n1hIGMS7D5lFpLCwSHYeQKCYm lBIta0RxR6G5/E1WurNUsHEOpr5wjnmvTpBY2LRv7PJAsXPWfbj08BEVMn1tkQjPNYNX hF67GytJTYv/Vyz3de6rqA9uvFJuQnKAIcIJOH/ofK7SwW+K89HQF7rTYWSq2y1pGU3m jBM5Nxc1UKBTWzeLLEhmx7poFHXhcQ2q390TxGS7AgGrEgsFmWNwIgiYPgYqsuZQLT3R sXPw== X-Gm-Message-State: ALKqPwcyHqHnRBpdTw9QuqSkHYUxx609vgcEV6g03EO4A1fUUfBZs/0n MYeyLRJqXyOgoy2Cc2i40I4= X-Google-Smtp-Source: AB8JxZrzFhnoH242NKGqhSPNXcf2Ga4m3lc18bZgl4ad8iNLe2nxfV/Pinx1dmA0CLZFJVjn0CCU9g== X-Received: by 2002:a5b:12:: with SMTP id a18-v6mr6707798ybp.524.1525786039241; Tue, 08 May 2018 06:27:19 -0700 (PDT) Received: from localhost ([72.188.97.40]) by smtp.gmail.com with ESMTPSA id z24-v6sm4807863ywj.99.2018.05.08.06.27.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 May 2018 06:27:18 -0700 (PDT) From: William Breathitt Gray To: linus.walleij@linaro.org Cc: linux-gpio@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, William Breathitt Gray Subject: [PATCH v2 3/7] gpio: 104-idi-48: Utilize for_each_set_port_word macro Date: Tue, 8 May 2018 09:27:13 -0400 Message-Id: <20a56dc5911439a36485faaf2e515dac0ecc6206.1525785532.git.vilhelm.gray@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: References: Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Replace boilerplate code in the get_multiple callback with the for_each_set_port_word macro in order to simplify and improve clarity. Signed-off-by: William Breathitt Gray --- drivers/gpio/gpio-104-idi-48.c | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/drivers/gpio/gpio-104-idi-48.c b/drivers/gpio/gpio-104-idi-48.c index 2c9738adb3a6..414dc8de0bd8 100644 --- a/drivers/gpio/gpio-104-idi-48.c +++ b/drivers/gpio/gpio-104-idi-48.c @@ -94,41 +94,17 @@ static int idi_48_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask, { struct idi_48_gpio *const idi48gpio = gpiochip_get_data(chip); size_t i; + size_t word; + unsigned int offset; 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); 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; - - /* 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 */ + for_each_set_port_word(i, word, offset, mask, ARRAY_SIZE(ports), 8) { port_state = inb(idi48gpio->base + ports[i]); - - /* store acquired bits at respective bits array offset */ - bits[word_index] |= port_state << word_offset; + bits[word] |= port_state << offset; } return 0;