From patchwork Thu Sep 8 10:48:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 75759 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp774623qgf; Thu, 8 Sep 2016 03:48:40 -0700 (PDT) X-Received: by 10.98.33.205 with SMTP id o74mr15757647pfj.81.1473331717695; Thu, 08 Sep 2016 03:48:37 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e5si13237881pfe.212.2016.09.08.03.48.37; Thu, 08 Sep 2016 03:48:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758944AbcIHKse (ORCPT + 27 others); Thu, 8 Sep 2016 06:48:34 -0400 Received: from mail-wm0-f43.google.com ([74.125.82.43]:35311 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753494AbcIHKsb (ORCPT ); Thu, 8 Sep 2016 06:48:31 -0400 Received: by mail-wm0-f43.google.com with SMTP id w12so27968949wmf.0 for ; Thu, 08 Sep 2016 03:48:30 -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=+37JGa4Rt+IcPPqhwO8Y2YtBfJ6YqJLH3IenNIGk5js=; b=fe1t4NkCxMYac8nvxfbaUqpcxYnl88tpBZW8aYigATtlJf3C4kQEpiBoqgkvPyRFF0 vcYStf6r2L/T3Th0Y6kTxtpFW0eTkfo/RVjgMbwmNvywE7EzI1pcILOT31WzaitpcDNV +6MwCFf5oxgyYURf5MzbmhXkWCFTkVq16zEF1m60AoxgCSsc9pDQsogXs7TjFUjoOOQQ mGSPAMBFVOxNNNR8HEb7JCKSl+PV4IqKu51FVi3edtkE1IHVZyoeMvnY9L1A97LMl5EG sOVoylGZTN3cfsbX4c/7m5nTTGhTal8gyJyCKQsOCDbZO9J3cvdUW8HJz3UAg+uXkt+8 X1mA== 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=+37JGa4Rt+IcPPqhwO8Y2YtBfJ6YqJLH3IenNIGk5js=; b=biOg4TIMflRST4cMdrq+4Ova79SX1Y21HIpfeR3Kle3M6px8OgpMWpnwMOv7KPmIzp ksnZ8j8tQ1kokXqTBkP2hlCzbJWc8kZCWqZMO6FoF6vqqdA5q5CQyMdpXFZ1DYdJmk/F ClHzOCtdnGYQ/a8HmbixFIcdEV1ij1WBT71D8ppyplcFCkqbyLB6SOUm3pZhm23N6fhC 4bzWBpC1IDkQzkBv5sWEGRTkc2wYbTMnWGn/+OEPMBcdkHQwupVn6YXVnJhrOszm9rBh 4hGvbQg3EeLGoUsydvpGqz0F44tWeHZAwd2AaGDVSnKhV1BbgBABDwSaRnJwGsxrRrns pmGg== X-Gm-Message-State: AE9vXwP1Zx1H3rsTyqiFVnVi0KroWSevOm96LWP9tLoShCbXOlgHmisk2ZiNlxPHbnrUEJH5 X-Received: by 10.194.235.69 with SMTP id uk5mr44908848wjc.53.1473331709349; Thu, 08 Sep 2016 03:48:29 -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 t5sm7151832wjm.12.2016.09.08.03.48.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Sep 2016 03:48:28 -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 v5 2/6] gpio: pca953x: refactor pca953x_write_regs() Date: Thu, 8 Sep 2016 12:48:18 +0200 Message-Id: <1473331702-26711-3-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1473331702-26711-1-git-send-email-bgolaszewski@baylibre.com> References: <1473331702-26711-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Avoid the unnecessary if-else in pca953x_write_regs() by splitting the routine into smaller, specialized functions and calling the right one via a function pointer held in struct pca953x_chip. Signed-off-by: Bartosz Golaszewski Reviewed-by: Andy Shevchenko --- drivers/gpio/gpio-pca953x.c | 75 ++++++++++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 28 deletions(-) -- 2.7.4 diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index 2a3194f..9870a34 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -133,6 +133,8 @@ struct pca953x_chip { unsigned long driver_data; const struct pca953x_reg_config *regs; + + int (*write_regs)(struct pca953x_chip *, int, u8 *); }; static int pca953x_read_single(struct pca953x_chip *chip, int reg, u32 *val, @@ -172,38 +174,44 @@ static int pca953x_write_single(struct pca953x_chip *chip, int reg, u32 val, return 0; } -static int pca953x_write_regs(struct pca953x_chip *chip, int reg, u8 *val) +static int pca953x_write_regs_8(struct pca953x_chip *chip, int reg, u8 *val) { - int ret = 0; + return i2c_smbus_write_byte_data(chip->client, reg, *val); +} - if (chip->gpio_chip.ngpio <= 8) - ret = i2c_smbus_write_byte_data(chip->client, reg, *val); - else if (chip->gpio_chip.ngpio >= 24) { - int bank_shift = fls((chip->gpio_chip.ngpio - 1) / BANK_SZ); - ret = i2c_smbus_write_i2c_block_data(chip->client, - (reg << bank_shift) | REG_ADDR_AI, - NBANK(chip), val); - } else { - switch (chip->chip_type) { - case PCA953X_TYPE: { - __le16 word = cpu_to_le16(get_unaligned((u16 *)val)); +static int pca953x_write_regs_16(struct pca953x_chip *chip, int reg, u8 *val) +{ + __le16 word = cpu_to_le16(get_unaligned((u16 *)val)); - ret = i2c_smbus_write_word_data(chip->client, reg << 1, - (__force u16)word); - break; - } - case PCA957X_TYPE: - ret = i2c_smbus_write_byte_data(chip->client, reg << 1, - val[0]); - if (ret < 0) - break; - ret = i2c_smbus_write_byte_data(chip->client, - (reg << 1) + 1, - val[1]); - break; - } - } + return i2c_smbus_write_word_data(chip->client, + reg << 1, (__force u16)word); +} + +static int pca957x_write_regs_16(struct pca953x_chip *chip, int reg, u8 *val) +{ + int ret; + + ret = i2c_smbus_write_byte_data(chip->client, reg << 1, val[0]); + if (ret < 0) + return ret; + + return i2c_smbus_write_byte_data(chip->client, (reg << 1) + 1, val[1]); +} +static int pca953x_write_regs_24(struct pca953x_chip *chip, int reg, u8 *val) +{ + int bank_shift = fls((chip->gpio_chip.ngpio - 1) / BANK_SZ); + + return i2c_smbus_write_i2c_block_data(chip->client, + (reg << bank_shift) | REG_ADDR_AI, + NBANK(chip), val); +} + +static int pca953x_write_regs(struct pca953x_chip *chip, int reg, u8 *val) +{ + int ret = 0; + + ret = chip->write_regs(chip, reg, val); if (ret < 0) { dev_err(&chip->client->dev, "failed writing register\n"); return ret; @@ -754,6 +762,17 @@ static int pca953x_probe(struct i2c_client *client, */ pca953x_setup_gpio(chip, chip->driver_data & PCA_GPIO_MASK); + if (chip->gpio_chip.ngpio <= 8) { + chip->write_regs = pca953x_write_regs_8; + } else if (chip->gpio_chip.ngpio >= 24) { + chip->write_regs = pca953x_write_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; + } + if (chip->chip_type == PCA953X_TYPE) ret = device_pca953x_init(chip, invert); else