Re: [git pull] (updated) OF-related build breakage fixes

[Anatolij Gustschin <agust-ynQEQJNshbs@public.gmane.org>]

On Thu, 1 Jul 2010 02:06:35 -0700
Dan Williams <dan.j.williams-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:

> of/dma: fix remaining ppc4xx build breakage
> 
> From: Dan Williams <dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> 
> Commit 05c02542 "of/dma: fix build breakage in ppc4xx adma driver"
> missed one conversion site.
> 
> Cc: Anatolij Gustschin <agust-ynQEQJNshbs@public.gmane.org>
> Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
> Signed-off-by: Dan Williams <dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> ---
> 
>  drivers/dma/ppc4xx/adma.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)

Acked-by: Anatolij Gustschin <agust-ynQEQJNshbs@public.gmane.org>

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) {