From patchwork Wed Dec 9 13:47:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 58119 Delivered-To: patch@linaro.org Received: by 10.112.147.194 with SMTP id tm2csp679352lbb; Wed, 9 Dec 2015 05:47:45 -0800 (PST) X-Received: by 10.66.139.72 with SMTP id qw8mr7372087pab.130.1449668863994; Wed, 09 Dec 2015 05:47:43 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s90si12866349pfi.45.2015.12.09.05.47.43; Wed, 09 Dec 2015 05:47:43 -0800 (PST) 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; 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; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753182AbbLINrn (ORCPT + 4 others); Wed, 9 Dec 2015 08:47:43 -0500 Received: from mail-lb0-f172.google.com ([209.85.217.172]:33425 "EHLO mail-lb0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753083AbbLINrm (ORCPT ); Wed, 9 Dec 2015 08:47:42 -0500 Received: by lbbkw15 with SMTP id kw15so30304212lbb.0 for ; Wed, 09 Dec 2015 05:47:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=sGsowPP88QFN9RnLlHnFOYGnwNbEygyoc52V0tA1vxc=; b=feaNDckxjo6ti6vOfquCZDMoM/o3NjZJ6CwnwKRe2hqE/To3vjchN2kgNKqWTCGMvG 68NtlxBPH1SZ3PfJVsyjnM7ZYdyTQfk30F+Am4qHrslJjnUEiD1sECyZpLuNORDV0JMN ttl3wXp4Bhl3ZluCI+nGp8gGRvKXF6OQEB2QBfKalQhnQbbfy6+h1Z1opADz0FFmq28d /t+no+omt2WUQgaAGH/+3jiJlHo2Tmd6Lqzrh3il7vrQUhO3vBV1YwWfuKSSyRfvmy26 grQtgUtguDyAKrjr6qpzoDcfGQbDbVPYsUEhF/FDbudDKruBiiUUsYgapOd3tHEx1L5S EZIQ== 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; bh=sGsowPP88QFN9RnLlHnFOYGnwNbEygyoc52V0tA1vxc=; b=nNCzYyXUjSjesogMrPNSVaH4clKvzgfV1mlqXwj4oY7Z4cn66lnSDbDoIca1/q+OCO E/KvaknU7jTnEKYiI5iSsAnsZDQYfKI4LStJ7fqhiAGSeh0S478bbVn5k4aR6dtt5fqK 1jwD2N6P/mu3As7F2x13UVUbkSj2hs5ORpkYWtTLK+ZtEDvSVUaLqFPk6v+e+qLp9o7M me6thrgs8Efr8BrxkL1Xo5skHMCLdM/dToknqFEiuMuzeikvU61l5HAn8T9Zul37RALu 2iRZE9ZA7AHwYq5L/HZhtrkNQhtQIFsfjUKdeWJzrAjOv3jUyNLwWLem+hcsBP1AVpIH oKVg== X-Gm-Message-State: ALoCoQn6hTkUL+qrgVb4Pd2aNXBf/IDV+/+H8NZvw1bn7Lz5gfjiOSMqbiwuIF0vfil5Z+2iScCL6XaCCkMyk+b4DLJJiTHHcg== X-Received: by 10.112.143.129 with SMTP id se1mr2542473lbb.55.1449668861247; Wed, 09 Dec 2015 05:47:41 -0800 (PST) Received: from localhost.localdomain ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id e9sm1431025lbs.13.2015.12.09.05.47.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Dec 2015 05:47:39 -0800 (PST) From: Linus Walleij To: linux-gpio@vger.kernel.org, Johan Hovold , Alexandre Courbot , Michael Welling , Markus Pargmann , Lee Jones Cc: Linus Walleij , Philipp Zabel Subject: [PATCH 163/182] mfd: htc-egpio: use gpiochip data pointer Date: Wed, 9 Dec 2015 14:47:37 +0100 Message-Id: <1449668857-6260-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@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(). Cc: Lee Jones Cc: Philipp Zabel Signed-off-by: Linus Walleij --- Lee please ACK this so I can take it through the GPIO tree. Philipp: should this driver move to drivers/gpio? Looks like so to me. --- drivers/mfd/htc-egpio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.4.3 -- 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 Acked-by: Lee Jones diff --git a/drivers/mfd/htc-egpio.c b/drivers/mfd/htc-egpio.c index d334e7d8a77d..2e066fe66ca7 100644 --- a/drivers/mfd/htc-egpio.c +++ b/drivers/mfd/htc-egpio.c @@ -155,7 +155,7 @@ static int egpio_get(struct gpio_chip *chip, unsigned offset) pr_debug("egpio_get_value(%d)\n", chip->base + offset); - egpio = container_of(chip, struct egpio_chip, chip); + egpio = gpiochip_get_data(chip); ei = dev_get_drvdata(egpio->dev); bit = egpio_bit(ei, offset); reg = egpio->reg_start + egpio_pos(ei, offset); @@ -170,7 +170,7 @@ static int egpio_direction_input(struct gpio_chip *chip, unsigned offset) { struct egpio_chip *egpio; - egpio = container_of(chip, struct egpio_chip, chip); + egpio = gpiochip_get_data(chip); return test_bit(offset, &egpio->is_out) ? -EINVAL : 0; } @@ -192,7 +192,7 @@ static void egpio_set(struct gpio_chip *chip, unsigned offset, int value) pr_debug("egpio_set(%s, %d(%d), %d)\n", chip->label, offset, offset+chip->base, value); - egpio = container_of(chip, struct egpio_chip, chip); + egpio = gpiochip_get_data(chip); ei = dev_get_drvdata(egpio->dev); bit = egpio_bit(ei, offset); pos = egpio_pos(ei, offset); @@ -216,7 +216,7 @@ static int egpio_direction_output(struct gpio_chip *chip, { struct egpio_chip *egpio; - egpio = container_of(chip, struct egpio_chip, chip); + egpio = gpiochip_get_data(chip); if (test_bit(offset, &egpio->is_out)) { egpio_set(chip, offset, value); return 0; @@ -330,7 +330,7 @@ static int __init egpio_probe(struct platform_device *pdev) chip->base = pdata->chip[i].gpio_base; chip->ngpio = pdata->chip[i].num_gpios; - gpiochip_add(chip); + gpiochip_add_data(chip, &ei->chip[i]); } /* Set initial pin values */