2004-10-11 07:54:11

by Jan Dittmer

[permalink] [raw]
Subject: aic7xxx remove warnings

This patch converts the aic7xxx driver to use module_param instead
of MODULE_PARM and therefore gets rid of two warning in the
non-modular build case.
Also I see there is lots of
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,3,0)
checks in there. Would you accept a patch to remove those?

Thanks,

Jan


diff -u linus/drivers/scsi/aic7xxx/aic7xxx_osm.c pcirescan/drivers/scsi/aic7xxx/aic7xxx_osm.c
--- linus/drivers/scsi/aic7xxx/aic7xxx_osm.c 2004-10-06 19:58:34.000000000 +0200
+++ pcirescan/drivers/scsi/aic7xxx/aic7xxx_osm.c 2004-10-11 09:48:10.000000000 +0200
@@ -449,7 +449,7 @@
MODULE_DESCRIPTION("Adaptec Aic77XX/78XX SCSI Host Bus Adapter driver");
MODULE_LICENSE("Dual BSD/GPL");
MODULE_VERSION(AIC7XXX_DRIVER_VERSION);
-MODULE_PARM(aic7xxx, "s");
+module_param(aic7xxx, charp, 0444);
MODULE_PARM_DESC(aic7xxx,
"period delimited, options string.\n"
" verbose Enable verbose/diagnostic logging\n"
@@ -863,7 +863,6 @@
return (0);
}
ahc_linux_size_nseg();
-#ifdef MODULE
/*
* If we've been passed any parameters, process them now.
*/
@@ -875,7 +874,6 @@
"aic7xxx: to see the proper way to specify options to the aic7xxx module\n"
"aic7xxx: Specifically, don't use any commas when passing arguments to\n"
"aic7xxx: insmod or else it might trash certain memory areas.\n");
-#endif

#if LINUX_VERSION_CODE > KERNEL_VERSION(2,3,0)
template->proc_name = "aic7xxx";