From patchwork Wed Sep 7 09:24:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 666853 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 3sTdP73BVHz9s9Y for ; Wed, 7 Sep 2016 19:25:47 +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=jFLOewKu; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754639AbcIGJZ1 (ORCPT ); Wed, 7 Sep 2016 05:25:27 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:36397 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932548AbcIGJZL (ORCPT ); Wed, 7 Sep 2016 05:25:11 -0400 Received: by mail-wm0-f54.google.com with SMTP id b187so105327543wme.1 for ; Wed, 07 Sep 2016 02:25:11 -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=4Gmx2oc3RH8ytmStJuDY9M3YhTDNRxN41wjMJelOeUs=; b=jFLOewKugty6Ah2TiqLtxkmMFL7i4T4Ip4IU+vb2n/4DheOsA83fHfraTTedHaCm2Y 2XBxFIlAYdT15Ty6yRPKq4ZTA4wnrzJSjPEn/udPc3WiiXoB/MXgjp+Zj0W8A/xBAjh9 guGySfPb9wluumZP7sURF6vWh8UEP2JXkXNp1dDkuHTrw/DGxzisx+lS2OkA/bcM+4No hAN30XL98vVT6dz1Y1ng1ihBzHJGIJvHWZGYqwMvaZJS1Bpv8o2WoRZhPvkgabj/9+9D Mxf+HMGrU5k0cuDD3tPBmjDUQ/6mkGU1sQXlIFlznp7adCQCTSGVtPaZZT3m6yNg1+vj ynhA== 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=4Gmx2oc3RH8ytmStJuDY9M3YhTDNRxN41wjMJelOeUs=; b=de0HkzAE7fr4V3yalskkI1xqf6L8OJoXhUTZ1Sdm4lUH1UU6Da6bGjB2NfJax+jCHK A3nIxhhYYvHrTJuGoeiks1/PgJoVAXBSD/Z4CgiD8jcFyH3HKrNmb4Gj7Tq+wl2gt0Sl JhXVokKvVYyqLpxQ7f79XBK++NCcNfhthW7T0Si/2nPcBZW/b9/2h2BtwUWeL4yi/81A Ic3IAlprQdLefLQTrDWQ6r2Hz+A6LjIBtLNOabGsFKMzKDw/HtruGgReJ7QOtfGADtz1 7KAmMX8DpNthRYa18wOBn/jSWRAZCF/gOW4EbhG+y2aNqqK/a47dkI41Z/0tAxuKy5oc MMVQ== X-Gm-Message-State: AE9vXwM3XquI0O4aLY019HhL0Z2gurFNGe5I7RH5C3Anvs4pZTA3YSgssjRlTzxM9S6tNwHn X-Received: by 10.28.94.85 with SMTP id s82mr2735551wmb.24.1473240310158; Wed, 07 Sep 2016 02:25:10 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id xy4sm29697502wjc.2.2016.09.07.02.25.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Sep 2016 02:25:09 -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 5/5] gpio: pca953x: refactor pca953x_read_regs() Date: Wed, 7 Sep 2016 11:24:57 +0200 Message-Id: <1473240297-19881-6-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_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 --- drivers/gpio/gpio-pca953x.c | 55 ++++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 16 deletions(-) diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index 00bb2ea..e417c42 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -134,6 +134,7 @@ struct pca953x_chip { const struct pca953x_offset *offset; 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, @@ -219,24 +220,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; @@ -766,10 +784,15 @@ static int pca953x_probe(struct i2c_client *client, */ pca953x_setup_gpio(chip, chip->driver_data & PCA_GPIO_MASK); - if (chip->gpio_chip.ngpio <= 8) + if (chip->gpio_chip.ngpio <= 8) { chip->write_regs = pca953x_write_regs_8; - else if (chip->gpio_chip.ngpio >= 24) + 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 { + chip->read_regs = pca953x_read_regs_16; + } if (PCA_CHIP_TYPE(chip->driver_data) == PCA953X_TYPE) ret = device_pca953x_init(chip, invert);