From patchwork Wed Sep 7 09:24:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 75617 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp228112qgf; Wed, 7 Sep 2016 02:26:08 -0700 (PDT) X-Received: by 10.66.159.170 with SMTP id xd10mr82085627pab.41.1473240368365; Wed, 07 Sep 2016 02:26:08 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g192si40421778pfb.119.2016.09.07.02.26.08; Wed, 07 Sep 2016 02:26:08 -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 S1756663AbcIGJZ7 (ORCPT + 4 others); Wed, 7 Sep 2016 05:25:59 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:36294 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757230AbcIGJZF (ORCPT ); Wed, 7 Sep 2016 05:25:05 -0400 Received: by mail-wm0-f49.google.com with SMTP id b187so105323162wme.1 for ; Wed, 07 Sep 2016 02:25:05 -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=0wn+aUmxV6lA7kQ7WgTs4kl9tsIFaprOWzUOtFHL9s0=; b=bX+gJMZDea5xMrqkoxHfC/SrRC3Q3AjaDb6zbRFwVtopZGJnmXjzV5cnJ7JpDWJ8jf Piy+n+m24Y7NCgG0SafqSiWZjRBa3VP0745YtKfItf8QQLqjNSyU+sD4lJmwyfYrR4fd +o7PMYJSvoBrKokzLjSCuBwnbTayZTshDvCb9UC3Yjvojp2re/m5TwZPb+vGNuJMJUwG C+te3NCeI5ysuUbgn2eakoWxPcG/S1bSEamAd1CZmMjXIXix6CG57brtXufV0YIykfmD ZtxjgsNNpP5pp/0vfiBLW1C+8EVI5RinBX+TA7S0UlybYthXigN1q9PeGani/OwlY/T6 b9GA== 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=0wn+aUmxV6lA7kQ7WgTs4kl9tsIFaprOWzUOtFHL9s0=; b=MkjhXDR0lv0tORIIXJuMbE1aUMetS32yhCz/4qDXl0xMhc/3oRArfB7WWygQtHmQS1 4TST1RLb1l8M4OVFQ9rWzpb256gl0MbZnc5KKCxFoFBouo6PLUqf+sLmTnq0nrZ1H/h7 JeOG9PJfAy8MER6sl9JdJ3jIDYTv5s+WDl3gTPph3ETeilFm5ZDC2UVHuVucVhL8mtXR 9qg0QYb3KAFkmaw4YmGrM+VCkwX6lfPCL7Yn9LHyEnVZr3robskrHByZ2y4e9KhJp0f+ CpzQd9qu6F2Z/B9BkrbyMZT4j3EydkUXe/xrEEblm8LItngVGnWP6sMtjJtsn+TfejgW fFhg== X-Gm-Message-State: AE9vXwPXeFXn+sY0r2tqoUOE2dbj6Am/4TirNjqrB27h+pm63X+2ou7bRkKWQl0Uz4XyLzRw X-Received: by 10.194.104.106 with SMTP id gd10mr39884122wjb.55.1473240304219; Wed, 07 Sep 2016 02:25:04 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id xy4sm29697502wjc.2.2016.09.07.02.25.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Sep 2016 02:25:03 -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 2/5] gpio: pca953x: code shrink Date: Wed, 7 Sep 2016 11:24:54 +0200 Message-Id: <1473240297-19881-3-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 There are multiple places in the driver code where a switch (chip->chip_type) is used to determine the proper register offset. Unduplicate the code by adding a simple structure holding the possible offsets that differ between the pca953x and pca957x chip families and use it to avoid the checks. Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpio-pca953x.c | 122 +++++++++++++++----------------------------- 1 file changed, 42 insertions(+), 80 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 2312f8d..195944b 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -94,6 +94,24 @@ MODULE_DEVICE_TABLE(acpi, pca953x_acpi_ids); #define NBANK(chip) DIV_ROUND_UP(chip->gpio_chip.ngpio, BANK_SZ) +struct pca953x_offset { + int direction; + int output; + int input; +}; + +static const struct pca953x_offset pca953x_offsets = { + .direction = PCA953X_DIRECTION, + .output = PCA953X_OUTPUT, + .input = PCA953X_INPUT, +}; + +static const struct pca953x_offset pca957x_offsets = { + .direction = PCA957X_CFG, + .output = PCA957X_OUT, + .input = PCA957X_IN, +}; + struct pca953x_chip { unsigned gpio_start; u8 reg_output[MAX_BANK]; @@ -113,6 +131,8 @@ struct pca953x_chip { const char *const *names; int chip_type; unsigned long driver_data; + + const struct pca953x_offset *offset; }; static int pca953x_read_single(struct pca953x_chip *chip, int reg, u32 *val, @@ -222,20 +242,12 @@ static int pca953x_gpio_direction_input(struct gpio_chip *gc, unsigned off) { struct pca953x_chip *chip = gpiochip_get_data(gc); u8 reg_val; - int ret, offset = 0; + int ret; mutex_lock(&chip->i2c_lock); reg_val = chip->reg_direction[off / BANK_SZ] | (1u << (off % BANK_SZ)); - switch (chip->chip_type) { - case PCA953X_TYPE: - offset = PCA953X_DIRECTION; - break; - case PCA957X_TYPE: - offset = PCA957X_CFG; - break; - } - ret = pca953x_write_single(chip, offset, reg_val, off); + ret = pca953x_write_single(chip, chip->offset->direction, reg_val, off); if (ret) goto exit; @@ -250,7 +262,7 @@ static int pca953x_gpio_direction_output(struct gpio_chip *gc, { struct pca953x_chip *chip = gpiochip_get_data(gc); u8 reg_val; - int ret, offset = 0; + int ret; mutex_lock(&chip->i2c_lock); /* set output level */ @@ -261,15 +273,7 @@ static int pca953x_gpio_direction_output(struct gpio_chip *gc, reg_val = chip->reg_output[off / BANK_SZ] & ~(1u << (off % BANK_SZ)); - switch (chip->chip_type) { - case PCA953X_TYPE: - offset = PCA953X_OUTPUT; - break; - case PCA957X_TYPE: - offset = PCA957X_OUT; - break; - } - ret = pca953x_write_single(chip, offset, reg_val, off); + ret = pca953x_write_single(chip, chip->offset->output, reg_val, off); if (ret) goto exit; @@ -277,15 +281,7 @@ static int pca953x_gpio_direction_output(struct gpio_chip *gc, /* then direction */ reg_val = chip->reg_direction[off / BANK_SZ] & ~(1u << (off % BANK_SZ)); - switch (chip->chip_type) { - case PCA953X_TYPE: - offset = PCA953X_DIRECTION; - break; - case PCA957X_TYPE: - offset = PCA957X_CFG; - break; - } - ret = pca953x_write_single(chip, offset, reg_val, off); + ret = pca953x_write_single(chip, chip->offset->direction, reg_val, off); if (ret) goto exit; @@ -299,18 +295,10 @@ static int pca953x_gpio_get_value(struct gpio_chip *gc, unsigned off) { struct pca953x_chip *chip = gpiochip_get_data(gc); u32 reg_val; - int ret, offset = 0; + int ret; mutex_lock(&chip->i2c_lock); - switch (chip->chip_type) { - case PCA953X_TYPE: - offset = PCA953X_INPUT; - break; - case PCA957X_TYPE: - offset = PCA957X_IN; - break; - } - ret = pca953x_read_single(chip, offset, ®_val, off); + ret = pca953x_read_single(chip, chip->offset->input, ®_val, off); mutex_unlock(&chip->i2c_lock); if (ret < 0) { /* NOTE: diagnostic already emitted; that's all we should @@ -327,7 +315,7 @@ static void pca953x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val) { struct pca953x_chip *chip = gpiochip_get_data(gc); u8 reg_val; - int ret, offset = 0; + int ret; mutex_lock(&chip->i2c_lock); if (val) @@ -337,15 +325,7 @@ static void pca953x_gpio_set_value(struct gpio_chip *gc, unsigned off, int val) reg_val = chip->reg_output[off / BANK_SZ] & ~(1u << (off % BANK_SZ)); - switch (chip->chip_type) { - case PCA953X_TYPE: - offset = PCA953X_OUTPUT; - break; - case PCA957X_TYPE: - offset = PCA957X_OUT; - break; - } - ret = pca953x_write_single(chip, offset, reg_val, off); + ret = pca953x_write_single(chip, chip->offset->output, reg_val, off); if (ret) goto exit; @@ -359,19 +339,10 @@ static void pca953x_gpio_set_multiple(struct gpio_chip *gc, { struct pca953x_chip *chip = gpiochip_get_data(gc); u8 reg_val[MAX_BANK]; - int ret, bank, offset = 0; + int ret, bank; int bank_shift = fls((chip->gpio_chip.ngpio - 1) / BANK_SZ); unsigned int bankmask, bankval; - switch (chip->chip_type) { - case PCA953X_TYPE: - offset = PCA953X_OUTPUT; - break; - case PCA957X_TYPE: - offset = PCA957X_OUT; - break; - } - memcpy(reg_val, chip->reg_output, NBANK(chip)); mutex_lock(&chip->i2c_lock); for (bank = 0; bank < NBANK(chip); bank++) { @@ -384,7 +355,9 @@ static void pca953x_gpio_set_multiple(struct gpio_chip *gc, } } - ret = i2c_smbus_write_i2c_block_data(chip->client, offset << bank_shift, NBANK(chip), reg_val); + ret = i2c_smbus_write_i2c_block_data(chip->client, + chip->offset->output << bank_shift, + NBANK(chip), reg_val); if (ret) goto exit; @@ -516,7 +489,7 @@ static bool pca953x_irq_pending(struct pca953x_chip *chip, u8 *pending) bool pending_seen = false; bool trigger_seen = false; u8 trigger[MAX_BANK]; - int ret, i, offset = 0; + int ret, i; if (chip->driver_data & PCA_PCAL) { /* Read the current interrupt status from the device */ @@ -541,15 +514,7 @@ static bool pca953x_irq_pending(struct pca953x_chip *chip, u8 *pending) return pending_seen; } - switch (chip->chip_type) { - case PCA953X_TYPE: - offset = PCA953X_INPUT; - break; - case PCA957X_TYPE: - offset = PCA957X_IN; - break; - } - ret = pca953x_read_regs(chip, offset, cur_stat); + ret = pca953x_read_regs(chip, chip->offset->input, cur_stat); if (ret) return false; @@ -609,20 +574,13 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, int irq_base) { struct i2c_client *client = chip->client; - int ret, i, offset = 0; + int ret, i; if (client->irq && irq_base != -1 && (chip->driver_data & PCA_INT)) { - switch (chip->chip_type) { - case PCA953X_TYPE: - offset = PCA953X_INPUT; - break; - case PCA957X_TYPE: - offset = PCA957X_IN; - break; - } - ret = pca953x_read_regs(chip, offset, chip->irq_stat); + ret = pca953x_read_regs(chip, + chip->offset->input, chip->irq_stat); if (ret) return ret; @@ -685,6 +643,8 @@ static int device_pca953x_init(struct pca953x_chip *chip, u32 invert) int ret; u8 val[MAX_BANK]; + chip->offset = &pca953x_offsets; + ret = pca953x_read_regs(chip, PCA953X_OUTPUT, chip->reg_output); if (ret) goto out; @@ -710,6 +670,8 @@ static int device_pca957x_init(struct pca953x_chip *chip, u32 invert) int ret; u8 val[MAX_BANK]; + chip->offset = &pca957x_offsets; + ret = pca953x_read_regs(chip, PCA957X_OUT, chip->reg_output); if (ret) goto out;