From patchwork Mon Sep 5 14:31:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 665850 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 3sSXHM4nPnz9ryZ for ; Tue, 6 Sep 2016 00:31:59 +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=obB1qV4r; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755128AbcIEObt (ORCPT ); Mon, 5 Sep 2016 10:31:49 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:32941 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755059AbcIEObr (ORCPT ); Mon, 5 Sep 2016 10:31:47 -0400 Received: by mail-wm0-f53.google.com with SMTP id w12so5965328wmf.0 for ; Mon, 05 Sep 2016 07:31:46 -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=+hxvHSDKerc2I/4HdJEMZHKsr6g2f2sPPDsB0HD8r+E=; b=obB1qV4rbV/U0EvA+934VnONpvAGF9FL27jv9bl/eRmUQ7YPus0eqM1D/yWuLTGSr2 9VefSTp39c4aZx/G4cAU5G0LUNdLGnnHcBgVIUPBzhlOIgKC2YoAY5cdY3lMJQjXWSDW 9HCoZcrPvo0jmvUxCger5k1ESGq3hJKYhp+8Cg+kj7MQf6Cva7t/I6qbegZoURUdWgtC EdSeq66j4Cq2HwILFoSYCWgwX3RFLcSkdST3lUQS/XIf7dmFMftUO6rJzV37tUY6rzq/ nTScK30VGYJwbNNNSJfcnwYtQEI5KpUvHIduJ/WjeeEUkOUIUXYmxoaE48j7Lu5VnXsv sOfA== 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=+hxvHSDKerc2I/4HdJEMZHKsr6g2f2sPPDsB0HD8r+E=; b=PsQSn6Shf3b1OxjsUTbXNrii64LfKsnigWvZXg1MJTPe0l3f7X9h6X3DbQLgmWipXc ftQTvtYN4js6WmQ1/6Bb99r5jAgWoUr5Pzj0PGATEpOWAfPtnIog06Vk9qwxsT7tmxUg ZdXrIadIlyhrjfzes5Ux04AXpSrlW5FjfVdlwYxd6qjU46hzXrEwlo2DT3Qgcv5y5d4r TIMeANn82OeprDzvg3v3oZifF3OTFw+7XAJ5NL5xixKQQLp3qOLgRcGjLZfingeCwi4q zB4MuErUB7mdW00NMtq7H0CImMzyrRKkrxXMfRSC+Zh+mKUI0kZ1uuU5tzrpcYUhaH06 D56Q== X-Gm-Message-State: AE9vXwNN4RqibPEYa4Ui4Brni8wEzBisEEgXhaVdSYaGgRssZ7OQId3Viz3pCHVsUFjKStWt X-Received: by 10.194.139.236 with SMTP id rb12mr31161132wjb.101.1473085905404; Mon, 05 Sep 2016 07:31:45 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id bc10sm28017507wjc.32.2016.09.05.07.31.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Sep 2016 07:31:44 -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 3/5] gpio: pca953x: refactor pca953x_write_regs() Date: Mon, 5 Sep 2016 16:31:33 +0200 Message-Id: <1473085895-31711-4-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_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 17cba0a..b64a7bb 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -133,6 +133,8 @@ struct pca953x_chip { unsigned long driver_data; 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