From patchwork Wed Mar 30 08:48:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 64653 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2468451lbc; Wed, 30 Mar 2016 01:51:40 -0700 (PDT) X-Received: by 10.98.8.74 with SMTP id c71mr11157351pfd.155.1459327899968; Wed, 30 Mar 2016 01:51:39 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q188si5016626pfq.49.2016.03.30.01.51.39; Wed, 30 Mar 2016 01:51:39 -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=@linaro.org; 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; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758955AbcC3Iv2 (ORCPT + 29 others); Wed, 30 Mar 2016 04:51:28 -0400 Received: from mail-lb0-f171.google.com ([209.85.217.171]:35659 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758838AbcC3Isi (ORCPT ); Wed, 30 Mar 2016 04:48:38 -0400 Received: by mail-lb0-f171.google.com with SMTP id bc4so27062769lbc.2 for ; Wed, 30 Mar 2016 01:48:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=N/DQBjHKS2U68PzK8y05DP6qPeWlr5fzJbVfsdz2Dpc=; b=OSDwU6i4GqF2nn2J7Vsu1J5I5HfLVnm29nPoumQK6Et4uXT6E2/BM2UQbEW6KGqy4j mZvkQy1BvIy7mxH0TN/kXlAqfTyyOqRyRmvechVN4T/QacBqA2SfOW06He+JqXd8HlMU 1co9yc2ZEneQju6ibBaP8kxnmygPOMBOC0wac= 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=N/DQBjHKS2U68PzK8y05DP6qPeWlr5fzJbVfsdz2Dpc=; b=MdslVwExEoYVygED1BjPRudDHd+9DIIxy63+orVern/qxETEvRqhOabwZYaVPHCfLL lePBbzJniVkGJCgVGXWESgtu/agiVgQ4qzCaAdBW499Tz25fMuTv4KFlm6qsBeC8IjUf 16m7fpsLL2o3dI2wPstiEzEiGG0HsMz/es7XJs4xdOsUo4Q2K7B788LTn1k3PqOj8r07 jS6fWeET+7MTitq3jowjfBMyyez8ukZnj/OfnbyqTwZl2itKCqrgCca7eHiA0pEPEbAp 3mSRK8tI3S/QFjKFT6HxxWM1srjPmDx5pbaBF+woiyAR39NSWXC6lwAaQAwkaBd7s4Ie rsFw== X-Gm-Message-State: AD7BkJKZ1jhwA+NM6mqhQK6Fz7IUdg37uJzOxF1h/ZCh4jD37VFBDy/HMN0AOX6AHcyKOH1h X-Received: by 10.112.135.230 with SMTP id pv6mr3194834lbb.68.1459327717216; Wed, 30 Mar 2016 01:48:37 -0700 (PDT) Received: from localhost.localdomain ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id l10sm421542lfb.35.2016.03.30.01.48.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Mar 2016 01:48:36 -0700 (PDT) From: Linus Walleij To: Samuel Ortiz , Lee Jones , linux-kernel@vger.kernel.org Cc: Linus Walleij Subject: [PATCH 4/9] mfd: htc-i2cpld: Use gpiochip data pointer Date: Wed, 30 Mar 2016 10:48:04 +0200 Message-Id: <1459327689-12786-5-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1459327689-12786-1-git-send-email-linus.walleij@linaro.org> References: <1459327689-12786-1-git-send-email-linus.walleij@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This makes the driver use the data pointer added to the gpio_chip to store a pointer to the state container instead of relying on container_of(). Acked-by: Lee Jones Signed-off-by: Linus Walleij --- drivers/mfd/htc-i2cpld.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) -- 2.4.3 diff --git a/drivers/mfd/htc-i2cpld.c b/drivers/mfd/htc-i2cpld.c index bd6b96d07ab8..3f9eee5f8fb9 100644 --- a/drivers/mfd/htc-i2cpld.c +++ b/drivers/mfd/htc-i2cpld.c @@ -227,8 +227,7 @@ static irqreturn_t htcpld_handler(int irq, void *dev) static void htcpld_chip_set(struct gpio_chip *chip, unsigned offset, int val) { struct i2c_client *client; - struct htcpld_chip *chip_data = - container_of(chip, struct htcpld_chip, chip_out); + struct htcpld_chip *chip_data = gpiochip_get_data(chip); unsigned long flags; client = chip_data->client; @@ -257,14 +256,12 @@ static void htcpld_chip_set_ni(struct work_struct *work) static int htcpld_chip_get(struct gpio_chip *chip, unsigned offset) { - struct htcpld_chip *chip_data; + struct htcpld_chip *chip_data = gpiochip_get_data(chip); u8 cache; if (!strncmp(chip->label, "htcpld-out", 10)) { - chip_data = container_of(chip, struct htcpld_chip, chip_out); cache = chip_data->cache_out; } else if (!strncmp(chip->label, "htcpld-in", 9)) { - chip_data = container_of(chip, struct htcpld_chip, chip_in); cache = chip_data->cache_in; } else return -EINVAL; @@ -291,9 +288,7 @@ static int htcpld_direction_input(struct gpio_chip *chip, static int htcpld_chip_to_irq(struct gpio_chip *chip, unsigned offset) { - struct htcpld_chip *chip_data; - - chip_data = container_of(chip, struct htcpld_chip, chip_in); + struct htcpld_chip *chip_data = gpiochip_get_data(chip); if (offset < chip_data->nirqs) return chip_data->irq_start + offset; @@ -451,14 +446,14 @@ static int htcpld_register_chip_gpio( gpio_chip->ngpio = plat_chip_data->num_gpios; /* Add the GPIO chips */ - ret = gpiochip_add(&(chip->chip_out)); + ret = gpiochip_add_data(&(chip->chip_out), chip); if (ret) { dev_warn(dev, "Unable to register output GPIOs for 0x%x: %d\n", plat_chip_data->addr, ret); return ret; } - ret = gpiochip_add(&(chip->chip_in)); + ret = gpiochip_add_data(&(chip->chip_in), chip); if (ret) { dev_warn(dev, "Unable to register input GPIOs for 0x%x: %d\n", plat_chip_data->addr, ret);