[PATCH linux v2 2/3] gpio/aspeed: Use handler_data in aspeed_gpio_irq_handler.

[Yi TZ Li]

Sorry dear mailing list,

I tried to send pull request. But the pull request includes Jeremy's commit
as well. Is this expected behavior or how to do pull request properly?

Please help.

Here is the commits of my forked linux repository dev-4.3 branch:
"d24fe31 [PATCH v3] hwmon: Add occ_i2c HWMON driver - Revise code based on
comments from Jeremy Kerr <jk at ozlabs.org>. - Add new HWMON attributes
7940494 gpio/aspeed: Use handler_data in aspeed_gpio_irq_handler.
fa744b2 Add BMC HWMON driver to kernel. Format patch based on Joel's
comments.
46b1744 net/faraday: Use ncsi_stop_dev()"

Here is the openbmc/linux dev-4.3 branch:
"6041e18 gpio/aspeed: Use handler_data in aspeed_gpio_irq_handler.
46b1744 net/faraday: Use ncsi_stop_dev()"

Thanks
-Yi



"openbmc" <openbmc-bounces+shliyi=cn.ibm.com at lists.ozlabs.org> wrote on
12/06/2015 11:40:25 PM:

> From: OpenBMC Patches <openbmc-patches at stwcx.xyz>
> To: openbmc at lists.ozlabs.org
> Date: 12/06/2015 11:42 PM
> Subject: [PATCH linux v2 2/3] gpio/aspeed: Use handler_data in
> aspeed_gpio_irq_handler.
> Sent by: "openbmc" <openbmc-bounces+shliyi=cn.ibm.com at lists.ozlabs.org>
>
> From: Jeremy Kerr <jk at ozlabs.org>
>
> In the port to 4.3, we converted to the newer irq api, but used the
> chip_data for the struct aspeed_gpio pointer, rather than the
> handler_data.
>
> We use irq_set_chaned_handler_and_data to establish this pointer, which
> sets handler_data. This change uses the appropriate pointer in our
> handler instead.
>
> Signed-off-by: Jeremy Kerr <jk at ozlabs.org>
> ---
>  drivers/gpio/gpio-aspeed.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c
> index 87e159a..152b7d4 100644
> --- a/drivers/gpio/gpio-aspeed.c
> +++ b/drivers/gpio/gpio-aspeed.c
> @@ -302,8 +302,8 @@ static int aspeed_gpio_set_type(struct irq_data
> *d, unsigned int type)
>
>  static void aspeed_gpio_irq_handler(struct irq_desc *desc)
>  {
> +   struct aspeed_gpio *gpio = irq_desc_get_handler_data(desc);
>     struct irq_chip *chip = irq_desc_get_chip(desc);
> -   struct aspeed_gpio *gpio = irq_desc_get_chip_data(desc);
>     unsigned int i, p, girq;
>     unsigned long reg;
>
> --
> 2.6.3
>
>
> _______________________________________________
> openbmc mailing list
> openbmc at lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/openbmc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ozlabs.org/pipermail/openbmc/attachments/20151206/ea797a7c/attachment.html>