diff for duplicates of <200504210238.39307.dtor_core@ameritech.net> diff --git a/a/1.txt b/N1/1.txt index ed9536c..8b13789 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,8 +1 @@ --------------- next part -------------- -A non-text attachment was scrubbed... -Name: w1-module-attrs.patch -Type: text/x-diff -Size: 2757 bytes -Desc: not available -Url : http://lists.lm-sensors.org/pipermail/lm-sensors/attachments/20050421/1b0e2aba/w1-module-attrs.bin diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..0e31ad3 --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,6 @@ +Content-Type: text/x-diff; + charset="iso-8859-1"; + name="w1-module-attrs.patch" +Content-Transfer-Encoding: 7bit +Content-Disposition: attachment; + filename="w1-module-attrs.patch" diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..be7484b --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,73 @@ +W1: allow changing w1 module parameters through sysfs, add parameter + descriptions and document them in Documentation/kernel-parameters.txt + +Signed-off-by: Dmitry Torokhov <dtor@mail.ru> +--- + + Documentation/kernel-parameters.txt | 19 ++++++++++++++++--- + drivers/w1/w1.c | 12 ++++++++---- + 2 files changed, 24 insertions(+), 7 deletions(-) + +Index: dtor/drivers/w1/w1.c +=================================================================== +--- dtor.orig/drivers/w1/w1.c ++++ dtor/drivers/w1/w1.c +@@ -43,12 +43,16 @@ MODULE_AUTHOR("Evgeniy Polyakov <johnpol + MODULE_DESCRIPTION("Driver for 1-wire Dallas network protocol."); + + static int w1_scan_interval = 10; ++module_param_named(scan_interval, w1_scan_interval, int, S_IWUSR | S_IRUGO); ++MODULE_PARM_DESC(scan_interval, "Interval between scans for slave devices on a wire."); ++ + static int w1_max_slave_count = 10; +-static int w1_max_slave_ttl = 10; ++module_param_named(max_slave_count, w1_max_slave_count, int, S_IWUSR | S_IRUGO); ++MODULE_PARM_DESC(max_slave_count, "Maximum number of slaves we allow on a wire."); + +-module_param_named(scan_interval, w1_scan_interval, int, 0); +-module_param_named(max_slave_count, w1_max_slave_count, int, 0); +-module_param_named(slave_ttl, w1_max_slave_ttl, int, 0); ++static int w1_max_slave_ttl = 10; ++module_param_named(slave_ttl, w1_max_slave_ttl, int, S_IWUSR | S_IRUGO); ++MODULE_PARM_DESC(slave_ttl, "Number of unsuccessful scans before slave device is deleted."); + + struct device_driver w1_master_driver = { + .name = "master", +Index: dtor/Documentation/kernel-parameters.txt +=================================================================== +--- dtor.orig/Documentation/kernel-parameters.txt ++++ dtor/Documentation/kernel-parameters.txt +@@ -78,6 +78,7 @@ restrictions referred to are that the re + V4L Video For Linux support is enabled. + VGA The VGA console has been enabled. + VT Virtual terminal support is enabled. ++ W1 Dallas 1-Wire support is enabled. + WDT Watchdog support is enabled. + XT IBM PC/XT MFM hard disk support is enabled. + X86-64 X86-64 architecture is enabled. +@@ -1471,11 +1472,23 @@ running once the system is up. + + vmhalt= [KNL,S390] + +- vmpoff= [KNL,S390] +- ++ vmpoff= [KNL,S390] ++ ++ w1.max_slave_count= ++ [HW,W1] Maximum number of slave devices we expect on ++ a wire (for one master). Default is 10. ++ ++ w1.scan_interval= ++ [HW,W1] Interval between scans for connected slave ++ devices on a wire. Default is 10 sec. ++ ++ w1.slave_ttl= [HW,W1] Number of unsuccessful scans before slave ++ device is declared disconncted and removed from the ++ bus. Default is 10. ++ + waveartist= [HW,OSS] + Format: <io>,<irq>,<dma>,<dma2> +- ++ + wd33c93= [HW,SCSI] + See header of drivers/scsi/wd33c93.c. diff --git a/a/content_digest b/N1/content_digest index c3f1587..5fbd9b8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,88 @@ "ref\0200504210207.02421.dtor_core@ameritech.net\0" - "From\0dtor_core@ameritech.net (Dmitry Torokhov)\0" + "From\0Dmitry Torokhov <dtor_core@ameritech.net>\0" "Subject\0[RFC/PATCH 22/22] W1: expose module parameters in sysfs\0" - "Date\0Thu, 19 May 2005 06:25:53 +0000\0" + "Date\0Thu, 21 Apr 2005 02:38:38 -0500\0" "To\0sensors@stimpy.netroedge.com\0" "Cc\0LKML <linux-kernel@vger.kernel.org>" Greg KH <gregkh@suse.de> " Evgeniy Polyakov <johnpol@2ka.mipt.ru>\0" - "\00:1\0" + "\01:1\0" "b\0" + "\01:2\0" + "fn\0w1-module-attrs.patch\0" + "b\0" + "W1: allow changing w1 module parameters through sysfs, add parameter\n" + " descriptions and document them in Documentation/kernel-parameters.txt\n" + "\n" + "Signed-off-by: Dmitry Torokhov <dtor@mail.ru>\n" + "---\n" + "\n" + " Documentation/kernel-parameters.txt | 19 ++++++++++++++++---\n" + " drivers/w1/w1.c | 12 ++++++++----\n" + " 2 files changed, 24 insertions(+), 7 deletions(-)\n" "\n" - "-------------- next part --------------\n" - "A non-text attachment was scrubbed...\n" - "Name: w1-module-attrs.patch\n" - "Type: text/x-diff\n" - "Size: 2757 bytes\n" - "Desc: not available\n" - Url : http://lists.lm-sensors.org/pipermail/lm-sensors/attachments/20050421/1b0e2aba/w1-module-attrs.bin + "Index: dtor/drivers/w1/w1.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1.c\n" + "+++ dtor/drivers/w1/w1.c\n" + "@@ -43,12 +43,16 @@ MODULE_AUTHOR(\"Evgeniy Polyakov <johnpol\n" + " MODULE_DESCRIPTION(\"Driver for 1-wire Dallas network protocol.\");\n" + " \n" + " static int w1_scan_interval = 10;\n" + "+module_param_named(scan_interval, w1_scan_interval, int, S_IWUSR | S_IRUGO);\n" + "+MODULE_PARM_DESC(scan_interval, \"Interval between scans for slave devices on a wire.\");\n" + "+\n" + " static int w1_max_slave_count = 10;\n" + "-static int w1_max_slave_ttl = 10;\n" + "+module_param_named(max_slave_count, w1_max_slave_count, int, S_IWUSR | S_IRUGO);\n" + "+MODULE_PARM_DESC(max_slave_count, \"Maximum number of slaves we allow on a wire.\");\n" + " \n" + "-module_param_named(scan_interval, w1_scan_interval, int, 0);\n" + "-module_param_named(max_slave_count, w1_max_slave_count, int, 0);\n" + "-module_param_named(slave_ttl, w1_max_slave_ttl, int, 0);\n" + "+static int w1_max_slave_ttl = 10;\n" + "+module_param_named(slave_ttl, w1_max_slave_ttl, int, S_IWUSR | S_IRUGO);\n" + "+MODULE_PARM_DESC(slave_ttl, \"Number of unsuccessful scans before slave device is deleted.\");\n" + " \n" + " struct device_driver w1_master_driver = {\n" + " \t.name = \"master\",\n" + "Index: dtor/Documentation/kernel-parameters.txt\n" + "===================================================================\n" + "--- dtor.orig/Documentation/kernel-parameters.txt\n" + "+++ dtor/Documentation/kernel-parameters.txt\n" + "@@ -78,6 +78,7 @@ restrictions referred to are that the re\n" + " \tV4L\tVideo For Linux support is enabled.\n" + " \tVGA\tThe VGA console has been enabled.\n" + " \tVT\tVirtual terminal support is enabled.\n" + "+\tW1\tDallas 1-Wire support is enabled.\n" + " \tWDT\tWatchdog support is enabled.\n" + " \tXT\tIBM PC/XT MFM hard disk support is enabled.\n" + " \tX86-64\tX86-64 architecture is enabled.\n" + "@@ -1471,11 +1472,23 @@ running once the system is up.\n" + " \n" + " \tvmhalt=\t\t[KNL,S390]\n" + " \n" + "-\tvmpoff=\t\t[KNL,S390] \n" + "- \n" + "+\tvmpoff=\t\t[KNL,S390]\n" + "+\n" + "+\tw1.max_slave_count=\n" + "+\t\t\t[HW,W1] Maximum number of slave devices we expect on\n" + "+\t\t\ta wire (for one master). Default is 10.\n" + "+\n" + "+\tw1.scan_interval=\n" + "+\t\t\t[HW,W1] Interval between scans for connected slave\n" + "+\t\t\tdevices on a wire. Default is 10 sec.\n" + "+\n" + "+\tw1.slave_ttl=\t[HW,W1] Number of unsuccessful scans before slave\n" + "+\t\t\tdevice is declared disconncted and removed from the\n" + "+\t\t\tbus. Default is 10.\n" + "+\n" + " \twaveartist=\t[HW,OSS]\n" + " \t\t\tFormat: <io>,<irq>,<dma>,<dma2>\n" + "- \n" + "+\n" + " \twd33c93=\t[HW,SCSI]\n" + " \t\t\tSee header of drivers/scsi/wd33c93.c." -62d19246c8914ce9278f0f684a00859a43e133a86e82af6d9c1adf9f675d04a6 +615c574a628f4eee72f5c43a569b913b14192e1541a52267681c7797803dce8c
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.