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 <javier.martinez@xxxxxxxxxxxxxxx> --- 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) { -- 1.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html