Prev: [PATCH 1/2] of/powerpc: fix fsl_msi device node pointer
Next: of/crypto: n2_core: fix build breakage
From: Wolfram Sang on 3 Jun 2010 00:10
On Wed, Jun 02, 2010 at 09:06:54PM -0600, Grant Likely wrote:
> Updated pull request. Added more fixes from Anatolij of the same sort.

Just a second. I think I found two more (using coccinelle)...

--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
From: Dan Williams on 1 Jul 2010 05:10
On Wed, Jun 2, 2010 at 8:06 PM, Grant Likely <grant.likely(a)secretlab.ca> wrote:
> Updated pull request.  Added more fixes from Anatolij of the same sort.

Here is one more (attached) that seems to have escaped.

--
Dan
From: Anatolij Gustschin on 1 Jul 2010 09:20
On Thu, 1 Jul 2010 02:06:35 -0700
Dan Williams <dan.j.williams(a)gmail.com> wrote:

> of/dma: fix remaining ppc4xx build breakage
>
> From: Dan Williams <dan.j.williams(a)intel.com>
>
> Commit 05c02542 "of/dma: fix build breakage in ppc4xx adma driver"
> missed one conversion site.
>
> Cc: Anatolij Gustschin <agust(a)denx.de>
> Cc: Grant Likely <grant.likely(a)secretlab.ca>
> Signed-off-by: Dan Williams <dan.j.williams(a)intel.com>
> ---
>
> drivers/dma/ppc4xx/adma.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)

Acked-by: Anatolij Gustschin <agust(a)denx.de>

Thanks for fixing!

>
>
> diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
> index 5a22ca6..7c37479 100644
> --- a/drivers/dma/ppc4xx/adma.c
> +++ b/drivers/dma/ppc4xx/adma.c
> @@ -4257,10 +4257,12 @@ static int ppc440spe_adma_setup_irqs(struct ppc440spe_adma_device *adev,
> struct ppc440spe_adma_chan *chan,
> int *initcode)
> {
> + struct of_device *ofdev;
> struct device_node *np;
> int ret;
>
> - np = container_of(adev->dev, struct of_device, dev)->node;
> + ofdev = container_of(adev->dev, struct of_device, dev);
> + np = ofdev->dev.of_node;
> if (adev->id != PPC440SPE_XOR_ID) {
> adev->err_irq = irq_of_parse_and_map(np, 1);
> if (adev->err_irq == NO_IRQ) {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Grant Likely on 2 Jul 2010 18:00
On Thu, Jul 1, 2010 at 7:16 AM, Anatolij Gustschin <agust(a)denx.de> wrote:
> On Thu, 1 Jul 2010 02:06:35 -0700
> Dan Williams <dan.j.williams(a)gmail.com> wrote:
>
>> of/dma: fix remaining ppc4xx build breakage
>>
>> From: Dan Williams <dan.j.williams(a)intel.com>
>>
>> Commit 05c02542 "of/dma: fix build breakage in ppc4xx adma driver"
>> missed one conversion site.

Thanks Dan. I've picked this up and will push it out to Linus

g.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 1/2] of/powerpc: fix fsl_msi device node pointer
Next: of/crypto: n2_core: fix build breakage