From patchwork Tue Apr 8 18:20:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 3950491 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9390A9F499 for ; Tue, 8 Apr 2014 18:24:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B8BAC20256 for ; Tue, 8 Apr 2014 18:24:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C4FF420272 for ; Tue, 8 Apr 2014 18:24:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757799AbaDHSVU (ORCPT ); Tue, 8 Apr 2014 14:21:20 -0400 Received: from bhuna.collabora.co.uk ([93.93.135.160]:41816 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757712AbaDHSVQ (ORCPT ); Tue, 8 Apr 2014 14:21:16 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: javier) with ESMTPSA id 2DEAE6019E7 From: Javier Martinez Canillas To: Linus Walleij Cc: Alexandre Courbot , Mika Westerberg , Andy Shevchenko , Arnd Bergmann , Santosh Shilimkar , Kevin Hilman , linux-gpio@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, Javier Martinez Canillas Subject: [RFC PATCH 2/5] gpiolib: set gpio_chip operations on add using a gpio_chip_ops Date: Tue, 8 Apr 2014 20:20:12 +0200 Message-Id: <1396981215-24888-3-git-send-email-javier.martinez@collabora.co.uk> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1396981215-24888-1-git-send-email-javier.martinez@collabora.co.uk> References: <1396981215-24888-1-git-send-email-javier.martinez@collabora.co.uk> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is a transitional change to avoid breaking git bisect-ability while converting GPIO controller drivers to set their operations by using the newly introduced struct gpio_chip_ops virtual function table. It should be removed once all GPIO chip drivers have been converted. Signed-off-by: Javier Martinez Canillas --- drivers/gpio/gpiolib.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 761013f..f0cc93a 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1188,6 +1188,25 @@ int gpiochip_add(struct gpio_chip *chip) goto fail; } + /* + * REVISIT: this is a workaround to not break git bisectability by + * allowing GPIO controller drivers to set either either the function + * pointers embedded in struct gpio_chip or by using a gpio_chip_ops. + * + * Should be removed once all drivers are converted to set chip->ops. + */ + if (chip->ops) { + chip->request = chip->ops->request; + chip->free = chip->ops->free; + chip->get_direction = chip->ops->get_direction; + chip->direction_input = chip->ops->direction_input; + chip->direction_output = chip->ops->direction_output; + chip->get = chip->ops->get; + chip->set = chip->ops->set; + chip->set_debounce = chip->ops->set_debounce; + chip->dbg_show = chip->ops->dbg_show; + } + spin_lock_irqsave(&gpio_lock, flags); if (base < 0) {