Re: [PATCH 3/6] ide: small ide_register_port() cleanup

[Bartlomiej Zolnierkiewicz]

On Sunday 18 January 2009, Andreas Schwab wrote:
> Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx> writes:
> 
> > Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
> > ---
> >  drivers/ide/ide-probe.c |    9 ++-------
> >  1 file changed, 2 insertions(+), 7 deletions(-)
> >
> > Index: b/drivers/ide/ide-probe.c
> > ===================================================================
> > --- a/drivers/ide/ide-probe.c
> > +++ b/drivers/ide/ide-probe.c
> > @@ -640,14 +640,9 @@ static int ide_register_port(ide_hwif_t 
> >  	/* register with global device tree */
> >  	dev_set_name(&hwif->gendev, hwif->name);
> >  	hwif->gendev.driver_data = hwif;
> > -	if (hwif->gendev.parent == NULL) {
> > -		if (hwif->dev)
> > -			hwif->gendev.parent = hwif->dev;
> > -		else
> > -			/* Would like to do = &device_legacy */
> > -			hwif->gendev.parent = NULL;
> > -	}
> > +	hwif->gendev.parent = hwif->dev;
> 
> This breaks ide-pmac.  It overwrites the parent that
> pmac_ide_macio_attach has set.
> 
> Signed-off-by: Andreas Schwab <schwab@xxxxxxx>
> 
> diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
> index 312127e..0db1ed9 100644
> --- a/drivers/ide/ide-probe.c
> +++ b/drivers/ide/ide-probe.c
> @@ -649,7 +649,8 @@ static int ide_register_port(ide_hwif_t *hwif)
>  	/* register with global device tree */
>  	dev_set_name(&hwif->gendev, hwif->name);
>  	hwif->gendev.driver_data = hwif;
> -	hwif->gendev.parent = hwif->dev;
> +	if (hwif->gendev.parent == NULL)
> +		hwif->gendev.parent = hwif->dev;
>  	hwif->gendev.release = hwif_release_dev;
>  
>  	ret = device_register(&hwif->gendev);

Applied, thanks for fixing it.

Since it is the second time this ->parent special case bited us in the *ss:

pmac_ide_macio_attach():
...
	hw.dev = &mdev->bus->pdev->dev;
	hw.parent = &mdev->ofdev.dev;
...

I again wonder what is the reason for having different struct device-s used
for DBDMA and for device tree on MACIO PMAC controllers.  Maybe there is no
real reason after all and we can use &mdev->ofdev.dev also for hwif->dev?

Thanks,
Bart
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/