From patchwork Wed Sep 7 13:37:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 75664 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp331214qgf; Wed, 7 Sep 2016 06:38:35 -0700 (PDT) X-Received: by 10.98.99.67 with SMTP id x64mr83200717pfb.26.1473255513287; Wed, 07 Sep 2016 06:38:33 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ue10si41242538pab.203.2016.09.07.06.38.32; Wed, 07 Sep 2016 06:38:33 -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 S935053AbcIGNi2 (ORCPT + 27 others); Wed, 7 Sep 2016 09:38:28 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:37544 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757467AbcIGNiA (ORCPT ); Wed, 7 Sep 2016 09:38:00 -0400 Received: by mail-wm0-f47.google.com with SMTP id w12so33177358wmf.0 for ; Wed, 07 Sep 2016 06:38:00 -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=/I8tAwwZ7QBO9Y8iQJPMjAVysk+kZbYHlEJ66HODcho=; b=F7gXRcMJZp+FpJ0Zuicr1jQDGoe1/o2HTUmim7HGfm683zBAmxQifOoJJyMuKFL7zw 1r5dq+qLT2wzRlwLXJnzSw8lcfh68i46sqnTNyJfxHHY9yO+md5JhOmqsF+OQ6OUfFDA hON5UEvKW5tEL+7MVKHd9uPd6iEUbtExdJ58okbNrJ1eNgvAF7k6mFlGzOk87LALnJ7c wKHV+zGR4jHhbT1CLIIQj9BURBn02wrOK+So0gMOL8MNQQ635vIaV6Ax6fiGq+zCEnXk TT/dlaSPkNglH1cVNEEmgBAm2PGec2j+3k2P/nu9Fw0ar9L2z2PvClFkWWjTI4zTSazZ 4yyg== 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=/I8tAwwZ7QBO9Y8iQJPMjAVysk+kZbYHlEJ66HODcho=; b=R/pX7Yp77Ojyi62kV3HDDDXYAx/55rDSVY5W+h0ntmVXkfj+JFuX/Z8MgRYvq9+R9f fC2xAdA89TYE41OA3NWDOA4tro/foqkwRjiTGOtkHGPOWWKEIcR/RFanuJ7Dph8uiUCS lzrAXAQTEHmkEM7LtZCExFXyjhfedkoqrC9TIhTQJ2xr0gmJNhLcg75Z1uiHNNaBdMMV fSpHgT9eeyKCmDNaL/4UewtSKGN8VFFVSGNsK8dM/xK124YhxvIas9+R5x0eIzRI1jmR 2MBJfRGN9WUazcdPCVYR6O5wRqs54PzQwjwGm3+nOhbebWsYDCegQsa0x0EDKbsaSC82 GSFg== X-Gm-Message-State: AE9vXwOUULPbtUHLwOnm2vcPLUSa1NtAus4JfGsIfQv4HhGYTmA4n4L2wIQwvPGnBPccQ+ca X-Received: by 10.194.95.105 with SMTP id dj9mr44691448wjb.20.1473255479099; Wed, 07 Sep 2016 06:37:59 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id 190sm4363889wmk.13.2016.09.07.06.37.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Sep 2016 06:37:58 -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 v3 2/5] gpio: pca953x: refactor pca953x_write_regs() Date: Wed, 7 Sep 2016 15:37:49 +0200 Message-Id: <1473255472-16090-3-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1473255472-16090-1-git-send-email-bgolaszewski@baylibre.com> References: <1473255472-16090-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 --- drivers/gpio/gpio-pca953x.c | 73 ++++++++++++++++++++++++++++----------------- 1 file changed, 45 insertions(+), 28 deletions(-) -- 2.7.4 diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index d47e6f9..b3020ee 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; @@ -754,6 +762,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) + chip->write_regs = pca953x_write_regs_8; + else if (chip->gpio_chip.ngpio >= 24) + chip->write_regs = pca953x_write_regs_24; + else + chip->write_regs = chip->chip_type == PCA953X_TYPE ? + pca953x_write_regs_16 : + pca957x_write_regs_16; + if (chip->chip_type == PCA953X_TYPE) ret = device_pca953x_init(chip, invert); else