[GIT PATCH] driver core fixes for your 2.6-git tree

[GIT PATCH] driver core fixes for your 2.6-git tree

[Greg KH]

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

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

[Greg Kroah-Hartman]

From: Johann Felix Soden <johfel@users.sourceforge.net>

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

Signed-off-by: Johann Felix Soden <johfel@users.sourceforge.net>
Acked-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 lib/dynamic_printk.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/dynamic_printk.c b/lib/dynamic_printk.c
index d83660f..d0fd0e4 100644
--- a/lib/dynamic_printk.c
+++ b/lib/dynamic_printk.c
@@ -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);
 
-- 
1.6.0.4

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

[Greg Kroah-Hartman]

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 <stephen.neuendorffer@xilinx.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 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(-)

diff --git a/drivers/char/xilinx_hwicap/buffer_icap.c b/drivers/char/xilinx_hwicap/buffer_icap.c
index aa7f796..05d8977 100644
--- a/drivers/char/xilinx_hwicap/buffer_icap.c
+++ b/drivers/char/xilinx_hwicap/buffer_icap.c
@@ -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.
  *
diff --git a/drivers/char/xilinx_hwicap/buffer_icap.h b/drivers/char/xilinx_hwicap/buffer_icap.h
index 8b0252b..d4f419e 100644
--- a/drivers/char/xilinx_hwicap/buffer_icap.h
+++ b/drivers/char/xilinx_hwicap/buffer_icap.h
@@ -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.
  *
diff --git a/drivers/char/xilinx_hwicap/fifo_icap.c b/drivers/char/xilinx_hwicap/fifo_icap.c
index 776b505..02225eb 100644
--- a/drivers/char/xilinx_hwicap/fifo_icap.c
+++ b/drivers/char/xilinx_hwicap/fifo_icap.c
@@ -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.
  *
diff --git a/drivers/char/xilinx_hwicap/fifo_icap.h b/drivers/char/xilinx_hwicap/fifo_icap.h
index 62bda45..4c9dd9a 100644
--- a/drivers/char/xilinx_hwicap/fifo_icap.h
+++ b/drivers/char/xilinx_hwicap/fifo_icap.h
@@ -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.
  *
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index d161319..f40ab69 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -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.
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.h b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
index 24d0d9b..8cca119 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
@@ -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.
  *
-- 
1.6.0.4

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

[Greg Kroah-Hartman]

From: Marcel Holtmann <marcel@holtmann.org>

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

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 lib/dynamic_printk.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/dynamic_printk.c b/lib/dynamic_printk.c
index d0fd0e4..8e30295 100644
--- a/lib/dynamic_printk.c
+++ b/lib/dynamic_printk.c
@@ -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);
 				}
 			}
 		}
-- 
1.6.0.4

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

[Greg Kroah-Hartman]

From: Dmitry Baryshkov <dbaryshkov@gmail.com>

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/staging/Kconfig |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index c95b286..5d457c9 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -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
-- 
1.6.0.4

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

[Alan Cox]

On Wed, 17 Dec 2008 11:28:21 -0800
Greg Kroah-Hartman <gregkh@suse.de> 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.

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

[Greg KH]

On Wed, Dec 17, 2008 at 11:08:55PM +0000, Alan Cox wrote:
> On Wed, 17 Dec 2008 11:28:21 -0800
> Greg Kroah-Hartman <gregkh@suse.de> 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