Re: [PATCH] firewire: Remove two unneeded checks for macros

From: Stefan Richter
Date: Tue Mar 19 2013 - 11:04:38 EST


On Mar 16 Paul Bolle wrote:
> The old IEEE 1394 driver stack was removed in v2.6.37. That made the
> checks for two Kconfig (module) macros unneeded, since they will now
> always evaluate to true. Remove these two checks.
>
> Signed-off-by: Paul Bolle <pebolle@xxxxxxxxxx>

Looks good to me, will commit it sometime soon.

> ---
> Perhaps these alias can be dropped entirely. Bat that's not my call.

Perhaps. One could look through various distributor mkinitrds, but I
suspect that would be an impossible task. First of all, I have no idea
what the package names could be. Second, there seem to be quite a few
distributions which don't have any sensible public FTP/HTTP server from
which packages can be downloaded separately.

> drivers/firewire/ohci.c | 2 --
> drivers/firewire/sbp2.c | 2 --
> 2 files changed, 4 deletions(-)
>
> diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
> index 45912e6..4a55b51 100644
> --- a/drivers/firewire/ohci.c
> +++ b/drivers/firewire/ohci.c
> @@ -3837,6 +3837,4 @@ MODULE_DESCRIPTION("Driver for PCI OHCI IEEE1394 controllers");
> MODULE_LICENSE("GPL");
>
> /* Provide a module alias so root-on-sbp2 initrds don't break. */
> -#ifndef CONFIG_IEEE1394_OHCI1394_MODULE
> MODULE_ALIAS("ohci1394");
> -#endif
> diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c
> index 1162d6b..12ec0e6 100644
> --- a/drivers/firewire/sbp2.c
> +++ b/drivers/firewire/sbp2.c
> @@ -1636,9 +1636,7 @@ MODULE_LICENSE("GPL");
> MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table);
>
> /* Provide a module alias so root-on-sbp2 initrds don't break. */
> -#ifndef CONFIG_IEEE1394_SBP2_MODULE
> MODULE_ALIAS("sbp2");
> -#endif
>
> static int __init sbp2_init(void)
> {

--
Stefan Richter
-=====-===-= --== =--==
http://arcgraph.de/sr/
--
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/