From patchwork Sat Dec 15 14:25:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1013924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="azxt7qjk"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43H8qb5cr8z9s4s for ; Sun, 16 Dec 2018 01:26:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730037AbeLOO0d (ORCPT ); Sat, 15 Dec 2018 09:26:33 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:39374 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729966AbeLOO0d (ORCPT ); Sat, 15 Dec 2018 09:26:33 -0500 Received: by mail-wr1-f67.google.com with SMTP id t27so8074125wra.6; Sat, 15 Dec 2018 06:26:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZNYURw3tH9DmBORc9fD+7ODj82imGs8g5WxeCqaGPr8=; b=azxt7qjkQzuXJsbWwAHrMWeGG3WX3aD7Xdgkn3hQ+6RJ84mAX8nfWW05KpS11VgD/h U1mbvUUkbOaC1u34XXR0n0PYUHFR/co9PQ1dSSe1G+GmNn5/IDT3QjLbIuXayt2jDfmZ PkIh7/+GGDFAhqRPkTkiyamPdAM1LmLSNqoD3TannwrrONYLbqnN6k9w/PmjEpdqM2eB NVefd4sY+r+iruc+OvHZkkkUvxiuolA5IRoxGfGhO9C4VodK99agPmRXRJkXg8zU/VLS qMcFOMQZuECGuLL7ZierYDAbuTk6/36Sf8zxi1Yb+hAPVk/TjZumMzIOEtzf1M2WG7r0 42ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZNYURw3tH9DmBORc9fD+7ODj82imGs8g5WxeCqaGPr8=; b=TC4HD6dt2YvT311s2VqKGWLDozFt4y0U/+RgbXEX003VJaHRH7RLMhy9sClIAeYAFs q1pyh5ihpOp/YcRumb07RkqLmF0XDetmyJgYdVyuUT89DVs0wo3bVR8wMFZE9FBOckMj AlIl+1yoxqp0jgCZ7D3Pu8mrm9ijPCzeC1eqgtTzbsLNSiidf7zM/9Vu66b17khghM+f zD0Qm8QvtGFqv6pGhtB81cakyJVcb5pLWygXMMsO2fidh7KwgJJgQSUKYWSzvjNFYYXZ zQxggoMIP0faVGo8MejaMsHgQxbVJvfVeamNxn2m1TU8jxqKo302PaQpl/+M+QO70/Ps EHrA== X-Gm-Message-State: AA+aEWbzRsg9GoS0gXsAD7bScwvYabdfTgS3VIHTyQ9BsNx98dBmf2tq 4K1TTQ0uqvhu/NdcwqnzhA4NKIr/ X-Google-Smtp-Source: AFSGD/XI2beqfvo0VD6W7MnULa2p0KGZLnqq3lp/K0lYDK+kmoGl0w1yo4vV/IwI7K7/Zv6Xh1ZLdg== X-Received: by 2002:adf:b6a1:: with SMTP id j33mr5652542wre.55.1544883991210; Sat, 15 Dec 2018 06:26:31 -0800 (PST) Received: from kurokawa.lan (ip-86-49-110-70.net.upcbroadband.cz. [86.49.110.70]) by smtp.gmail.com with ESMTPSA id c7sm15401225wre.64.2018.12.15.06.26.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Dec 2018 06:26:30 -0800 (PST) From: Marek Vasut X-Google-Original-From: Marek Vasut To: linux-gpio@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, Marek Vasut , Linus Walleij , Bartosz Golaszewski Subject: [PATCH V3 04/14] gpio: pca953x: Unify pca95{3,7}x_write_regs_16() Date: Sat, 15 Dec 2018 15:25:55 +0100 Message-Id: <20181215142605.15397-5-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181215142605.15397-1-marek.vasut+renesas@gmail.com> References: <20181215142605.15397-1-marek.vasut+renesas@gmail.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org At this point, these two functions only differ in whether they do or do not set the address increment bit on PCA9575. Merge these two functions together to simplify the code a bit. Signed-off-by: Marek Vasut Cc: Linus Walleij Cc: Bartosz Golaszewski --- V2: No change V3: No change --- drivers/gpio/gpio-pca953x.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index 8f6478f4545f..7288a589a6b7 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -208,14 +208,11 @@ static int pca953x_write_regs_8(struct pca953x_chip *chip, int reg, u8 *val) static int pca953x_write_regs_16(struct pca953x_chip *chip, int reg, u8 *val) { - u16 word = get_unaligned((u16 *)val); + u32 regaddr = (reg << 1); - return i2c_smbus_write_word_data(chip->client, reg << 1, word); -} - -static int pca957x_write_regs_16(struct pca953x_chip *chip, int reg, u8 *val) -{ - u32 regaddr = (reg << 1) | REG_ADDR_AI; + /* PCA9575 needs address-increment on multi-byte writes */ + if (PCA_CHIP_TYPE(chip->driver_data) == PCA957X_TYPE) + regaddr |= REG_ADDR_AI; return i2c_smbus_write_i2c_block_data(chip->client, regaddr, NBANK(chip), val); @@ -892,10 +889,7 @@ static int pca953x_probe(struct i2c_client *client, chip->write_regs = pca953x_write_regs_24; chip->read_regs = pca953x_read_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; + chip->write_regs = pca953x_write_regs_16; chip->read_regs = pca953x_read_regs_16; }