From patchwork Mon Sep 5 14:31:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 75426 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp102047qgf; Mon, 5 Sep 2016 07:32:06 -0700 (PDT) X-Received: by 10.66.237.71 with SMTP id va7mr63971357pac.124.1473085924895; Mon, 05 Sep 2016 07:32:04 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k16si10907151pfj.70.2016.09.05.07.32.04; Mon, 05 Sep 2016 07:32:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755119AbcIEObx (ORCPT + 4 others); Mon, 5 Sep 2016 10:31:53 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:36165 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754852AbcIEObt (ORCPT ); Mon, 5 Sep 2016 10:31:49 -0400 Received: by mail-wm0-f47.google.com with SMTP id b187so22473618wme.1 for ; Mon, 05 Sep 2016 07:31:48 -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=qe3o68CbldkrLkTxqmgHg1KPeuLGfP/dTY8SjBPpBd8=; b=iullzkbgRmQa+q+gFmlLcdOsiKyJFElPva+q9I4u6nesf7bdgJ4Awmp1yEWatdGaou 45ZqegVQD4ImSEB8xoGh/F+1RG6s68R4ThxoozRv4hLst3WQdbbyEc93mCxak56v4aFW yQ0wP0wAhWiguZVRQ9+u1XvHYOnEf3r6/+726nahwRMrYckPuMswEhanuQ+y6dOjjkr0 Ya0ZQ5Eu0rKcooTPErA3ik0c9K4UXQvndcjpXEI8LiRjLOFch/gIviGxH9I+DsKJZXR2 3hlKyztPVM705fpj31FH+lJlRnsQqQNQodblqmh6S2Hh/+aEw4jUAowfxdKGIxKefoYn blew== 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=qe3o68CbldkrLkTxqmgHg1KPeuLGfP/dTY8SjBPpBd8=; b=D2jUd+MbYJvttiguZLMcf7xoKhl2mfM+zmgKDP4Nh88AKJ4zFwdCAFHPVZEwn2oboD 0SK7BtMD48gKsAZdkTmkwt81Kxq6Qomc1SE7b60t4VCW5lcDdHbVO+oYvNAkGt4hKxlv izG6JesOlsVLrXwHgqtlVbBwFpoCwm1LsMxgosCyOgWr/iWRQVMO7kriR4ffggXPkmwD jTnxVT78Lnzj8Hg4hV7W4f7hocLG1DJxJ98hcFYuAtMgXpo8FgzOSX2FRYOJZwkSq5hw +N3jZbhvRLVGd2IDI8ijz/0ZDMHdHEBfCdhIU1jOKZRC89915TjMK9taLgR+W27WWTmw tYMA== X-Gm-Message-State: AE9vXwMKSm7SHhFfohcGEfc7jvdlI7/wIoUGVpM0MI5fzT0CP1ztNWVmwpuVF5g0SBxR9G7j X-Received: by 10.28.232.15 with SMTP id f15mr16278381wmh.51.1473085907904; Mon, 05 Sep 2016 07:31:47 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id bc10sm28017507wjc.32.2016.09.05.07.31.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Sep 2016 07:31:47 -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 5/5] gpio: pca953x: refactor pca953x_read_regs() Date: Mon, 5 Sep 2016 16:31:35 +0200 Message-Id: <1473085895-31711-6-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1473085895-31711-1-git-send-email-bgolaszewski@baylibre.com> References: <1473085895-31711-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(-) -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index 86676dd..0ddcbbc 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -134,6 +134,7 @@ struct pca953x_chip { 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);