From patchwork Wed Sep 7 09:24:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 666854 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 3sTdPR4ZTjz9s9N for ; Wed, 7 Sep 2016 19:26:03 +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=GeTmd2b4; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755510AbcIGJZo (ORCPT ); Wed, 7 Sep 2016 05:25:44 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:38900 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757235AbcIGJZG (ORCPT ); Wed, 7 Sep 2016 05:25:06 -0400 Received: by mail-wm0-f46.google.com with SMTP id 1so20667374wmz.1 for ; Wed, 07 Sep 2016 02:25:06 -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=wdAiDVEiszMd6aexZafdX//6vVBeTa+cH1uw39gzJpg=; b=GeTmd2b4cg/yHuAMwBwUaj5Soii4s30R5C0RJTBA/CcdthzfOw4NDBJJgCZ8ccrT3x m2gg1L4NHU6rt9n8JpOC+FGrPvo7mhLv3HXFGunKhKiRMpSEINjJnn7chMd1tOZwIEqb OQ4mf5HBpfb/Yg8PKyVXj+ovTIdc6p4wydq87dd4kAiEPwm+LLuMxivxUJeI0ESly6hg bvBCvRI6/xz7oJagb0QdeArz/vcs+A2kAmieaaxRDGrGwyE0n3VRzJUcnGL9k10Pj/dU GVJuO8VBb9YC9ni9Ux/zzByrNurTIamFxbD3/S7lUQ7rJMAe9lBj9XGMkopv4qh++ZdV TvPQ== 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=wdAiDVEiszMd6aexZafdX//6vVBeTa+cH1uw39gzJpg=; b=gSEDSvQYs1PChrfR4uUlRjvcyhk4eBDPg7si3J0zMii6vuxDMFoWZngCGrW4Gyze8l rSo+WBkIas/XV+AzZuhrJv65SGjupclBXIrc1wnNRj+sw8SU67JSxLRkcnQIBFLMwHCO e3/4acMRJxMqmmySxHcrY40Lke/w4GUHwQvhFPBjw/VtGLK30ogmEGzPwGc1FRImlEac IomUNPmRrl8lW1L+NnTuguvpIvP9HyvGLsHVN+aya5dp0pNm3yBkkl27kQIF1CIuPKRD eBTkfkug6jL/S3PMECHThI96hLtwa2wIqOao+cW7ia+zaBaJS9+DCdR+56cexReIkXBs NhgQ== X-Gm-Message-State: AE9vXwNDZ8hmLo8j1EPJ2QBBTKHFXTeroxrtC0LlA6KhtrQNCaqdjzEDzpqIOlqkfGm74fzU X-Received: by 10.28.185.202 with SMTP id j193mr2755410wmf.78.1473240305256; Wed, 07 Sep 2016 02:25:05 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id xy4sm29697502wjc.2.2016.09.07.02.25.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Sep 2016 02:25:04 -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 v2 3/5] gpio: pca953x: refactor pca953x_write_regs() Date: Wed, 7 Sep 2016 11:24:55 +0200 Message-Id: <1473240297-19881-4-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1473240297-19881-1-git-send-email-bgolaszewski@baylibre.com> References: <1473240297-19881-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_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 --- drivers/gpio/gpio-pca953x.c | 75 ++++++++++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 28 deletions(-) diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index 195944b..6b62898 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_offset *offset; + + 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; @@ -645,6 +653,9 @@ static int device_pca953x_init(struct pca953x_chip *chip, u32 invert) chip->offset = &pca953x_offsets; + if (!chip->write_regs) + chip->write_regs = pca953x_write_regs_16; + ret = pca953x_read_regs(chip, PCA953X_OUTPUT, chip->reg_output); if (ret) goto out; @@ -672,6 +683,9 @@ static int device_pca957x_init(struct pca953x_chip *chip, u32 invert) chip->offset = &pca957x_offsets; + if (!chip->write_regs) + chip->write_regs = pca957x_write_regs_16; + ret = pca953x_read_regs(chip, PCA957X_OUT, chip->reg_output); if (ret) goto out; @@ -755,6 +769,11 @@ 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; + if (chip->chip_type == PCA953X_TYPE) ret = device_pca953x_init(chip, invert); else