Re: [PATCH 1/7] ide: add ide_host_add() helper

[Sergei Shtylyov]

Bartlomiej Zolnierkiewicz wrote:

> Add ide_host_add() helper which does ide_host_alloc()+ide_host_register(),
> then convert ide_setup_pci_device[s](), ide_legacy_device_add() and some
> host drivers to use it.

> While at it:

> * Fix ide_setup_pci_device[s](), ide_arm.c, gayle.c, ide-4drives.c,
>   macide.c, q40ide.c, cmd640.c and cs5520.c to return correct error value.

> * -ENOENT -> -ENOMEM in rapide.c, ide-h8300.c, ide-generic.c, au1xxx-ide.c
>   and pmac.c

> * -ENODEV -> -ENOMEM in palm_bk3710.c, ide_platform.c and delkin_cb.c

> * -1 -> -ENOMEM in ide-pnp.c

> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
> Index: b/drivers/ide/arm/palm_bk3710.c
> ===================================================================
> --- a/drivers/ide/arm/palm_bk3710.c
> +++ b/drivers/ide/arm/palm_bk3710.c
> @@ -351,7 +351,7 @@ static int __devinit palm_bk3710_probe(s
>  	struct resource *mem, *irq;
>  	struct ide_host *host;

   You forgot to remove this variable which caused the warning:

drivers/ide/arm/palm_bk3710.c: In the fucntion ‘palm_bk3710_probe’
drivers/ide/arm/palm_bk3710.c:350: warning: unused variable ‘host’

>  	unsigned long base;
> -	int i;
> +	int i, rc;
>  	hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
>  
>  	clkp = clk_get(NULL, "IDECLK");
> @@ -394,16 +394,14 @@ static int __devinit palm_bk3710_probe(s
>  	hw.irq = irq->start;
>  	hw.chipset = ide_palm3710;
>  
> -	host = ide_host_alloc(&palm_bk3710_port_info, hws);
> -	if (host == NULL)
> +	rc = ide_host_add(&palm_bk3710_port_info, hws, NULL);
> +	if (rc)
>  		goto out;
>  
> -	ide_host_register(host, &palm_bk3710_port_info, hws);
> -
>  	return 0;
>  out:
>  	printk(KERN_WARNING "Palm Chip BK3710 IDE Register Fail\n");
> -	return -ENODEV;
> +	return rc;
>  }
>  
>  /* work with hotplug and coldplug */

MBR, Sergei
--
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/