Skip to contentSkip to conversation

driver core fixes for your 2.6-git tree

PATCH New Greg KH 2 participants 7 messages Dec 17, 2008

Subsystems (4)
Staging Library code Char and misc drivers Arm/Zynq architecture
lore
Share & tools
lore

Greg KH

author
#0 lore raw

PATCH 1/1 driver core fixes for your 2.6-git tree

Here are 4 patches for your 2.6-git tree.

They contain:
- licensing fix for the xilinx_hwicap drivers (signed off by the original authors)
- 2 dynamic debug printk fixes
- staging Kconfig fix

All of these have been in the -next trees and the -mm releases for a while now.

Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git/

The patches will be sent as a follow-on to this message to lkml for people to see.

thanks,

greg k-h

------------

 drivers/char/xilinx_hwicap/buffer_icap.c   |    3 ---
 drivers/char/xilinx_hwicap/buffer_icap.h   |    3 ---
 drivers/char/xilinx_hwicap/fifo_icap.c     |    3 ---
 drivers/char/xilinx_hwicap/fifo_icap.h     |    3 ---
 drivers/char/xilinx_hwicap/xilinx_hwicap.c |    3 ---
 drivers/char/xilinx_hwicap/xilinx_hwicap.h |    3 ---
 drivers/staging/Kconfig                    |    3 +++
 lib/dynamic_printk.c                       |    6 +++---
 8 files changed, 6 insertions(+), 21 deletions(-)

---------------

Dmitry Baryshkov (1):
STAGING: Move staging drivers back to staging-specific menu

Greg Kroah-Hartman (1):
xilinx_hwicap: remove improper wording in license statement

Johann Felix Soden (1):
driver core: fix using 'ret' variable in unregister_dynamic_debug_module

Marcel Holtmann (1):
driver core: add newlines to debugging enabled/disabled messages

author
#1 lore raw

PATCH 1/4 driver core: fix using 'ret' variable in unregister_dynamic_debug_module

From: Johann Felix Soden <[email protected]>

The 'ret' variable is assigned, but not used in the return statement. Fix this.

Signed-off-by Johann Felix Soden <[email protected]>
Acked-by Jason Baron <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 lib/dynamic_printk.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
lib/dynamic_printk.c +1 -1
index d83660f..d0fd0e4 100644
@@ -135,7 +135,7 @@ int unregister_dynamic_debug_module(char *mod_name)
 	nr_entries--;
 out:
 	up(&debug_list_mutex);
-	return 0;
+	return ret;
 }
 EXPORT_SYMBOL_GPL(unregister_dynamic_debug_module);
Signature · 1 line
1.6.0.4
author
#2 lore raw

PATCH 2/4 xilinx_hwicap: remove improper wording in license statement

In reply to Greg KH

GPLv2 doesn't allow additional restrictions to be imposed on any code, so this wording needs to be removed from these files.

Signed-off-by Stephen Neuendorffer <[email protected]>
Cc stable <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/char/xilinx_hwicap/buffer_icap.c   |    3 ---
 drivers/char/xilinx_hwicap/buffer_icap.h   |    3 ---
 drivers/char/xilinx_hwicap/fifo_icap.c     |    3 ---
 drivers/char/xilinx_hwicap/fifo_icap.h     |    3 ---
 drivers/char/xilinx_hwicap/xilinx_hwicap.c |    3 ---
 drivers/char/xilinx_hwicap/xilinx_hwicap.h |    3 ---
 6 files changed, 0 insertions(+), 18 deletions(-)
drivers/char/xilinx_hwicap/buffer_icap.c +0 -3
index aa7f796..05d8977 100644
@@ -21,9 +21,6 @@
  *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  *     FOR A PARTICULAR PURPOSE.
  *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
  *     (c) Copyright 2003-2008 Xilinx Inc.
  *     All rights reserved.
  *
drivers/char/xilinx_hwicap/buffer_icap.h +0 -3
index 8b0252b..d4f419e 100644
@@ -21,9 +21,6 @@
  *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  *     FOR A PARTICULAR PURPOSE.
  *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
  *     (c) Copyright 2003-2008 Xilinx Inc.
  *     All rights reserved.
  *
drivers/char/xilinx_hwicap/fifo_icap.c +0 -3
index 776b505..02225eb 100644
@@ -21,9 +21,6 @@
  *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  *     FOR A PARTICULAR PURPOSE.
  *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
  *     (c) Copyright 2007-2008 Xilinx Inc.
  *     All rights reserved.
  *
drivers/char/xilinx_hwicap/fifo_icap.h +0 -3
index 62bda45..4c9dd9a 100644
@@ -21,9 +21,6 @@
  *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  *     FOR A PARTICULAR PURPOSE.
  *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
  *     (c) Copyright 2007-2008 Xilinx Inc.
  *     All rights reserved.
  *
drivers/char/xilinx_hwicap/xilinx_hwicap.c +0 -3
index d161319..f40ab69 100644
@@ -21,9 +21,6 @@
  *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  *     FOR A PARTICULAR PURPOSE.
  *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
  *     (c) Copyright 2002 Xilinx Inc., Systems Engineering Group
  *     (c) Copyright 2004 Xilinx Inc., Systems Engineering Group
  *     (c) Copyright 2007-2008 Xilinx Inc.
drivers/char/xilinx_hwicap/xilinx_hwicap.h +0 -3
index 24d0d9b..8cca119 100644
@@ -21,9 +21,6 @@
  *     INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  *     FOR A PARTICULAR PURPOSE.
  *
- *     Xilinx products are not intended for use in life support appliances,
- *     devices, or systems. Use in such applications is expressly prohibited.
- *
  *     (c) Copyright 2003-2007 Xilinx Inc.
  *     All rights reserved.
  *
Signature · 1 line
1.6.0.4
#3 lore raw

Re: [PATCH 2/4] xilinx_hwicap: remove improper wording in license statement

Quoted 2 lines · On Wed, 17 Dec 2008 11:28:21 -0800 Greg Kroah-Hartman <[email protected]> wrote:

GPLv2 doesn't allow additional restrictions to be imposed on any code, so this wording needs to be removed from these files.

You only need to remove the "Use in .. expressly prohibited bit", the rest seems like useful relevant information.

author
#4 lore raw

Re: [PATCH 2/4] xilinx_hwicap: remove improper wording in license statement

Quoted 8 lines · Alan Cox
Quoted 2 lines · On Wed, 17 Dec 2008 11:28:21 -0800 Greg Kroah-Hartman <[email protected]> wrote:

GPLv2 doesn't allow additional restrictions to be imposed on any code, so this wording needs to be removed from these files.

You only need to remove the "Use in .. expressly prohibited bit", the rest seems like useful relevant information.

As this ended up just being boiler-plate wording from an internal Xilinx template, and didn't apply at all to these files, it seemed easier to just remove the whole thing :)

thanks,

greg k-h

author
#5 lore raw

PATCH 3/4 driver core: add newlines to debugging enabled/disabled messages

In reply to Greg KH

From: Marcel Holtmann <[email protected]>

Both messages are missing the newline and thus dmesg output gets scrambled.

Signed-off-by Marcel Holtmann <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 lib/dynamic_printk.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
lib/dynamic_printk.c +2 -2
index d0fd0e4..8e30295 100644
@@ -289,7 +289,7 @@ static ssize_t pr_debug_write(struct file *file, const char __user *buf,
 					dynamic_enabled = DYNAMIC_ENABLED_SOME;
 					err = 0;
 					printk(KERN_DEBUG
-					       "debugging enabled for module %s",
+					       "debugging enabled for module %s\n",
 					       elem->name);
 				} else if (!value && (elem->enable == 1)) {
 					elem->enable = 0;

@@ -309,7 +309,7 @@ static ssize_t pr_debug_write(struct file *file, const char __user *buf,
 					err = 0;
 					printk(KERN_DEBUG
 					       "debugging disabled for module "
-					       "%s", elem->name);
+					       "%s\n", elem->name);
 				}
 			}
 		}
Signature · 1 line
1.6.0.4
author
#6 lore raw

PATCH 4/4 STAGING: Move staging drivers back to staging-specific menu

In reply to Greg KH

From: Dmitry Baryshkov <[email protected]>

Signed-off-by Dmitry Baryshkov <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/Kconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/staging/Kconfig +3 -0
index c95b286..5d457c9 100644
@@ -22,6 +22,8 @@ menuconfig STAGING
 	  If in doubt, say N here.
 
 
+if STAGING
+
 config STAGING_EXCLUDE_BUILD
 	bool "Exclude Staging drivers from being built" if STAGING
 	default y

@@ -62,3 +64,4 @@ source "drivers/staging/at76_usb/Kconfig"
 source "drivers/staging/poch/Kconfig"
 
 endif # !STAGING_EXCLUDE_BUILD
+endif # STAGING
Signature · 1 line
1.6.0.4