From patchwork Fri Sep 9 09:17:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 667939 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sVs8P6Ttrz9ryn for ; Fri, 9 Sep 2016 19:19:01 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b=zV4uWZgr; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753185AbcIIJR6 (ORCPT ); Fri, 9 Sep 2016 05:17:58 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:38380 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753176AbcIIJRy (ORCPT ); Fri, 9 Sep 2016 05:17:54 -0400 Received: by mail-wm0-f48.google.com with SMTP id 1so21435923wmz.1 for ; Fri, 09 Sep 2016 02:17:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VBITpIea4thtXdfpGNP6BTcBoSkEx0q1D5/14qXyh1s=; b=zV4uWZgru3XAuTpeQa1tyXetqA5Yg61To6WZC8FgelB57atTy6IfmCz9J1QXVX1ggc nMF3cmVn8860HblI3wqC18e+gthmy9ste3lBppNNh7Y9CtIwkgDSCKouRB02XljTAxIZ A0S7o9hTD4tFysv5yFWGPtXkxa99+GIu+gzCoQr34ZOtIo/7i3exeBAUDWQoyPiWty59 WwQzSmQT+yU7irmdLXwnFugJkTfE7gg1dUe5lCIIk+PUm55lJC4/HVx8zdg8U9zQwxoR VktBJqNtnky2KQif/Ie7RBht95IY7j9o3+k3CRdxULf6dOjNegKpMwrDpS7NZ6SY1ubB BTzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VBITpIea4thtXdfpGNP6BTcBoSkEx0q1D5/14qXyh1s=; b=Vbc2OOBGVJcVr9ksjS4viUDeQwsmka9nSMccRCt5Nx5lhkTCRe6KLPhlgocZ6P2DOM zdNsp8QzsXucsyKmV1axazVND7eRdthN4BbSRn1g6lIL33h5CjMQuVYzfTiVdigKihp9 xYKpELAy4ELQYXZHUP5gWyyXD8PujtoetP9H/FZSITPYFKIulm1K54xM7oliPx0769ma gcejt4A5X/DQVjfLd0KTjDjuepEO30rpwWh6U5+7Q0KUDyeeirFzNidbhMT/Cg5hmk89 MEK8x6pPK+YVaHWyakXZnV4ge3eY1OFKTLwi29zR0aSGAdvSg9Ift+7HXQqnBm3LcuPM KGEg== X-Gm-Message-State: AE9vXwMur1B1PccuIM7sWfZk9/Tc4fznKrYvYfrxdwxr58Aev9lPi8tR4AuWgox3/MnLKgo/ X-Received: by 10.28.23.141 with SMTP id 135mr1993213wmx.100.1473412672547; Fri, 09 Sep 2016 02:17:52 -0700 (PDT) Received: from bgdev-debian.lan (jua06-1-82-242-157-225.fbx.proxad.net. [82.242.157.225]) by smtp.gmail.com with ESMTPSA id i127sm1716246wmf.4.2016.09.09.02.17.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Sep 2016 02:17:51 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Alexandre Courbot , Andy Shevchenko , Vignesh R , Yong Li , Geert Uytterhoeven Cc: linux-gpio , LKML , Bartosz Golaszewski Subject: [PATCH v6 3/5] gpio: pca953x: refactor pca953x_read_regs() Date: Fri, 9 Sep 2016 11:17:36 +0200 Message-Id: <1473412658-13120-4-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1473412658-13120-1-git-send-email-bgolaszewski@baylibre.com> References: <1473412658-13120-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Avoid the unnecessary if-else in pca953x_read_regs() by spltting the routine into smaller, specialized functions and calling the right one via a function pointer held in struct pca953x. Signed-off-by: Bartosz Golaszewski Reviewed-by: Andy Shevchenko --- drivers/gpio/gpio-pca953x.c | 49 ++++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index e9defeb..e7bf3b3 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -137,6 +137,7 @@ struct pca953x_chip { const struct pca953x_reg_config *regs; int (*write_regs)(struct pca953x_chip *, int, u8 *); + int (*read_regs)(struct pca953x_chip *, int, u8 *); }; static int pca953x_read_single(struct pca953x_chip *chip, int reg, u32 *val, @@ -222,24 +223,41 @@ static int pca953x_write_regs(struct pca953x_chip *chip, int reg, u8 *val) return 0; } -static int pca953x_read_regs(struct pca953x_chip *chip, int reg, u8 *val) +static int pca953x_read_regs_8(struct pca953x_chip *chip, int reg, u8 *val) { int ret; - if (chip->gpio_chip.ngpio <= 8) { - ret = i2c_smbus_read_byte_data(chip->client, reg); - *val = ret; - } else if (chip->gpio_chip.ngpio >= 24) { - int bank_shift = fls((chip->gpio_chip.ngpio - 1) / BANK_SZ); + ret = i2c_smbus_read_byte_data(chip->client, reg); + *val = ret; - ret = i2c_smbus_read_i2c_block_data(chip->client, - (reg << bank_shift) | REG_ADDR_AI, - NBANK(chip), val); - } else { - ret = i2c_smbus_read_word_data(chip->client, reg << 1); - val[0] = (u16)ret & 0xFF; - val[1] = (u16)ret >> 8; - } + return ret; +} + +static int pca953x_read_regs_16(struct pca953x_chip *chip, int reg, u8 *val) +{ + int ret; + + ret = i2c_smbus_read_word_data(chip->client, reg << 1); + val[0] = (u16)ret & 0xFF; + val[1] = (u16)ret >> 8; + + return ret; +} + +static int pca953x_read_regs_24(struct pca953x_chip *chip, int reg, u8 *val) +{ + int bank_shift = fls((chip->gpio_chip.ngpio - 1) / BANK_SZ); + + return i2c_smbus_read_i2c_block_data(chip->client, + (reg << bank_shift) | REG_ADDR_AI, + NBANK(chip), val); +} + +static int pca953x_read_regs(struct pca953x_chip *chip, int reg, u8 *val) +{ + int ret; + + ret = chip->read_regs(chip, reg, val); if (ret < 0) { dev_err(&chip->client->dev, "failed reading register\n"); return ret; @@ -784,13 +802,16 @@ static int pca953x_probe(struct i2c_client *client, if (chip->gpio_chip.ngpio <= 8) { chip->write_regs = pca953x_write_regs_8; + chip->read_regs = pca953x_read_regs_8; } else if (chip->gpio_chip.ngpio >= 24) { chip->write_regs = pca953x_write_regs_24; + chip->read_regs = pca953x_read_regs_24; } else { if (PCA_CHIP_TYPE(chip->driver_data) == PCA953X_TYPE) chip->write_regs = pca953x_write_regs_16; else chip->write_regs = pca957x_write_regs_16; + chip->read_regs = pca953x_read_regs_16; } if (chip->chip_type == PCA953X_TYPE)