Re: [PATCH] Fix drivers/char/cyclades.c warning with CONFIG_PCI=n

[Jiri Slaby]

Gabriel C napsal(a):
> Hi,
> 
> when CONFIG_PCI is not set I get this warning :
> 
> ...
> 
> drivers/char/cyclades.c: In function 'cy_init':
> drivers/char/cyclades.c:5488: warning: label 'err_unr' defined but not used
> 
> ...
> 
> 
> Signed-off-by: Gabriel Craciunescu <nix.or.die@xxxxxxxxxxxxxx>
> 
> ---
> 
> diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
> index 9e0adfe..1fa0bda 100644
> --- a/drivers/char/cyclades.c
> +++ b/drivers/char/cyclades.c
> @@ -5485,8 +5485,11 @@ static int __init cy_init(void)
>  #endif
>  
>  	return 0;
> +
> +#ifdef CONFIG_PCI
>  err_unr:
>  	tty_unregister_driver(cy_serial_driver);
> +#endif
>  err_frtty:
>  	put_tty_driver(cy_serial_driver);
>  err:

NAK

remove the ifdef at all. pci_register_driver becomes a void function if
!CONFIG_PCI. This will get rid of ugly macros inside the code. And Cc akpm.

-- 
Jiri Slaby (jirislaby@xxxxxxxxx)
Faculty of Informatics, Masaryk University
-
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/