Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754690Ab0AYSLW (ORCPT ); Mon, 25 Jan 2010 13:11:22 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754679Ab0AYSLT (ORCPT ); Mon, 25 Jan 2010 13:11:19 -0500 Received: from mail.dev.rtsoft.ru ([213.79.90.226]:51305 "HELO mail.dev.rtsoft.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753097Ab0AYSLQ (ORCPT ); Mon, 25 Jan 2010 13:11:16 -0500 Date: Mon, 25 Jan 2010 21:11:14 +0300 From: Anton Vorontsov To: Grant Likely , David Brownell Cc: Andrew Morton , Bill Gatliff , Dmitry Eremin-Solenikov , Benjamin Herrenschmidt , linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] powerpc/mcu_mpc8349emitx: Remove OF GPIO handling stuff Message-ID: <20100125181114.GD13805@oksana.dev.rtsoft.ru> References: <20100125180957.GA5380@oksana.dev.rtsoft.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20100125180957.GA5380@oksana.dev.rtsoft.ru> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3487 Lines: 132 With the new OF GPIO infrastructure it's much easier to handle I2C GPIO controllers, i.e. now drivers don't have to deal with the OF-specific bits. Signed-off-by: Anton Vorontsov --- arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 68 +++++------------------- 1 files changed, 14 insertions(+), 54 deletions(-) diff --git a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c index 73c7e6b..5525175 100644 --- a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c +++ b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c @@ -18,8 +18,6 @@ #include #include #include -#include -#include #include #include @@ -36,7 +34,7 @@ struct mcu { struct mutex lock; struct device_node *np; struct i2c_client *client; - struct of_gpio_chip of_gc; + struct gpio_chip gc; u8 reg_ctrl; }; @@ -55,8 +53,7 @@ static void mcu_power_off(void) static void mcu_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) { - struct of_gpio_chip *of_gc = to_of_gpio_chip(gc); - struct mcu *mcu = container_of(of_gc, struct mcu, of_gc); + struct mcu *mcu = container_of(gc, struct mcu, gc); u8 bit = 1 << (4 + gpio); mutex_lock(&mcu->lock); @@ -75,53 +72,6 @@ static int mcu_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val) return 0; } -static int mcu_gpiochip_add(struct mcu *mcu) -{ - struct device_node *np; - struct of_gpio_chip *of_gc = &mcu->of_gc; - struct gpio_chip *gc = &of_gc->gc; - int ret; - - np = of_find_compatible_node(NULL, NULL, "fsl,mcu-mpc8349emitx"); - if (!np) - return -ENODEV; - - gc->owner = THIS_MODULE; - gc->label = np->full_name; - gc->can_sleep = 1; - gc->ngpio = MCU_NUM_GPIO; - gc->base = -1; - gc->set = mcu_gpio_set; - gc->direction_output = mcu_gpio_dir_out; - of_gc->chip = gc; - of_gc->gpio_cells = 2; - of_gc->xlate = of_gpio_simple_xlate; - - np->data = of_gc; - mcu->np = np; - - /* - * We don't want to lose the node, its ->data and ->full_name... - * So, if succeeded, we don't put the node here. - */ - ret = gpiochip_add(gc); - if (ret) - of_node_put(np); - return ret; -} - -static int mcu_gpiochip_remove(struct mcu *mcu) -{ - int ret; - - ret = gpiochip_remove(&mcu->of_gc.gc); - if (ret) - return ret; - of_node_put(mcu->np); - - return 0; -} - static int __devinit mcu_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -141,7 +91,16 @@ static int __devinit mcu_probe(struct i2c_client *client, goto err; mcu->reg_ctrl = ret; - ret = mcu_gpiochip_add(mcu); + mcu->gc.dev = &client->dev; + mcu->gc.owner = THIS_MODULE; + mcu->gc.label = dev_name(&client->dev); + mcu->gc.can_sleep = 1; + mcu->gc.ngpio = MCU_NUM_GPIO; + mcu->gc.base = -1; + mcu->gc.set = mcu_gpio_set; + mcu->gc.direction_output = mcu_gpio_dir_out; + + ret = gpiochip_add(&mcu->gc); if (ret) goto err; @@ -168,9 +127,10 @@ static int __devexit mcu_remove(struct i2c_client *client) glob_mcu = NULL; } - ret = mcu_gpiochip_remove(mcu); + ret = gpiochip_remove(&mcu->gc); if (ret) return ret; + i2c_set_clientdata(client, NULL); kfree(mcu); return 0; -- 1.6.5.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/