From patchwork Fri Sep 9 09:17: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: 667938 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 3sVs8J5hWhz9ryn for ; Fri, 9 Sep 2016 19:18:56 +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=yh5JnrnQ; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753235AbcIIJR7 (ORCPT ); Fri, 9 Sep 2016 05:17:59 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:37403 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753100AbcIIJRv (ORCPT ); Fri, 9 Sep 2016 05:17:51 -0400 Received: by mail-wm0-f49.google.com with SMTP id w12so21529003wmf.0 for ; Fri, 09 Sep 2016 02:17:51 -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=QMF1iHkYCLWbSP4n7svsUyDAHJsztYBp7V7uemmfyUA=; b=yh5JnrnQnN3GZMb6D+6491t2BFMeWPfRyumIKhnG5uX+j5LaDOxOBdjRP1VovGSRte Mfykw+3igymOeKegM4lEkIxn9+RKBhVeVRlQhsIufAOgg5KpK19jDKvH1h7gg1G3GEuT IL0zy5t7PhwTYzXCqu9OEODaI27AnrEekWirpeM8LG+hADfLIDyjkOAjcpt4vEXF/WsC RI4pGNchpI3+148eYbHMiBIVZNWTnIGrZ4Oz+MdTeQq0GsJlYJdPvj0fUWszVr4S1gie obofB7GxLFEMNCPOlfeobWlVLL3ZrsgzbzkFPYidCBqm0YJ6ODPOfhq8+C9uw9RbA62L TJiA== 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=QMF1iHkYCLWbSP4n7svsUyDAHJsztYBp7V7uemmfyUA=; b=Pb6MSVvmxaxL+uE179eWQ+RKsYvKenTJZH5W/IH5fqGIlwQrxmTVau/C9OsCeKP1bA jgPbKrS/Ib7MtlEPXAYAhPJHTyiQTt580Z8x5g8vwQfu6a0L5RAzUkrY0dZ4XKlpYb5t LE30ZcwBUjleXJNYxxVGTY79HpKxJImjiDV7DwZAkgaBWhV2m53vtmkmNtwg4yovbKZq Vc2ul4feGI5PoAFgWe49scxuKGoPUNbmQO1dT6+We0r4sEIq+WrTogZqpPF1KnrFCOvX DPgtFljwyQ6yKzAHgHuaWQJ65hB3eVO62pUXp8+EDFOEG3+ZkyIcMD6XQPFE6dAoexYa ZrWw== X-Gm-Message-State: AE9vXwM/4kKERqIP+t7tJH+tv+shOo8b7NoAKYiU16FibcDb9od7z2A4OHXBhPZAZp82W1OI X-Received: by 10.28.141.6 with SMTP id p6mr1996291wmd.110.1473412670223; Fri, 09 Sep 2016 02:17:50 -0700 (PDT) Received: from bgdev-debian.lan (jua06-1-82-242-157-225.fbx.proxad.net. [82.242.157.225]) by smtp.gmail.com with ESMTPSA id i127sm1716246wmf.4.2016.09.09.02.17.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Sep 2016 02:17:49 -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 v6 2/5] gpio: pca953x: refactor pca953x_write_regs() Date: Fri, 9 Sep 2016 11:17:35 +0200 Message-Id: <1473412658-13120-3-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1473412658-13120-1-git-send-email-bgolaszewski@baylibre.com> References: <1473412658-13120-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 Reviewed-by: Andy Shevchenko --- 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 5d65c9e..e9defeb 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -135,6 +135,8 @@ struct pca953x_chip { struct regulator *regulator; const struct pca953x_reg_config *regs; + + int (*write_regs)(struct pca953x_chip *, int, u8 *); }; static int pca953x_read_single(struct pca953x_chip *chip, int reg, u32 *val, @@ -174,38 +176,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; @@ -774,6 +782,17 @@ 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 { + if (PCA_CHIP_TYPE(chip->driver_data) == PCA953X_TYPE) + chip->write_regs = pca953x_write_regs_16; + else + chip->write_regs = pca957x_write_regs_16; + } + if (chip->chip_type == PCA953X_TYPE) ret = device_pca953x_init(chip, invert); else