• Andreas Schwab's avatar
    ide: fix IDE PMAC breakage · bb54affa
    Andreas Schwab authored
    Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> writes:
    
    > Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    > ---
    >  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 [bart: commit 96d40941
    
     ("ide: small
    ide_register_port() cleanup")] breaks ide-pmac.  It overwrites the parent
    that pmac_ide_macio_attach has set.
    Signed-off-by: default avatarAndreas Schwab <schwab@suse.de>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    bb54affa