[2.6.19 patch] drivers/ide/pci/generic.c: re-add the __setup("all-generic-ide",...)

[Adrian Bunk]

On Wed, Oct 18, 2006 at 07:18:44PM -0400, Alan Cox wrote:
> On Thu, Oct 19, 2006 at 12:15:20AM +0200, Adrian Bunk wrote:
> > IOW, your patch does break existing setups since the change to 
> > module_param() requires prefixing with the module name (the ata_generic 
> > option with the same name is irrelevant)?
> > 
> > Considering that drivers/ide/ is slowly approaching a RIP status, 
> > is such an incompatible change really required?
> > 
> > I'd be more inclined to revert your patch.
> 
> We shouldn't revert it - there is a real problem for some users whose
> distro has it modular this fixed. We might want to honour both 

Agreed, patch below.

cu
Adrian


<--  snip  -->


The change from __setup() to module_param_named() requires users to 
prefix the option with "generic.".

This patch re-adds the __setup() additionally to the 
module_param_named().

Usually it would make sense getting rid of such an obsolete __setup() at 
some time, but considering that drivers/ide/ is slowly approaching a RIP 
status it's already implicitely scheduled for removal.

This patch fixes kernel Bugzilla #7353.

Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>

--- linux-2.6/drivers/ide/pci/generic.c.old	2006-10-19 16:35:15.000000000 +0200
+++ linux-2.6/drivers/ide/pci/generic.c	2006-10-19 16:46:21.000000000 +0200
@@ -40,6 +40,19 @@
 
 static int ide_generic_all;		/* Set to claim all devices */
 
+/*
+ * the module_param_named() was added for the modular case
+ * the __setup() is left as compatibility for existing setups
+ */
+#ifndef MODULE
+static int __init ide_generic_all_on(char *unused)
+{
+	ide_generic_all = 1;
+	printk(KERN_INFO "IDE generic will claim all unknown PCI IDE storage controllers.");
+	return 1;
+}
+__setup("all-generic-ide", ide_generic_all_on);
+#endif
 module_param_named(all_generic_ide, ide_generic_all, bool, 0444);
 MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE storage controllers.");
 

-
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/