31 files changed, 105 insertions, 96 deletions
diff --git a/misc-c2port-use-dev_bin_attrs-instead-of-hand-coding-it.patch b/applied/misc-c2port-use-dev_bin_attrs-instead-of-hand-coding-it.patch
index 79a279f1d14c21..79a279f1d14c21 100644
--- a/misc-c2port-use-dev_bin_attrs-instead-of-hand-coding-it.patch
+++ b/applied/misc-c2port-use-dev_bin_attrs-instead-of-hand-coding-it.patch
diff --git a/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch b/applied/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch
index 5677c3185c92f4..5677c3185c92f4 100644
--- a/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch
+++ b/applied/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch
diff --git a/usb-adutux-remove-custom-debug-macro.patch b/applied/usb-adutux-remove-custom-debug-macro.patch
index e8482b5b86b4ee..e8482b5b86b4ee 100644
--- a/usb-adutux-remove-custom-debug-macro.patch
+++ b/applied/usb-adutux-remove-custom-debug-macro.patch
diff --git a/usb-adutux-remove-direct-calls-to-printk.patch b/applied/usb-adutux-remove-direct-calls-to-printk.patch
index 56463b6254d5cf..56463b6254d5cf 100644
--- a/usb-adutux-remove-direct-calls-to-printk.patch
+++ b/applied/usb-adutux-remove-direct-calls-to-printk.patch
diff --git a/usb-adutux-remove-unneeded-tracing-macros.patch b/applied/usb-adutux-remove-unneeded-tracing-macros.patch
index 8b26214ac16e42..8b26214ac16e42 100644
--- a/usb-adutux-remove-unneeded-tracing-macros.patch
+++ b/applied/usb-adutux-remove-unneeded-tracing-macros.patch
diff --git a/usb-gadget-fix-up-comment.patch b/applied/usb-gadget-fix-up-comment.patch
index c5d42c0e7362de..c5d42c0e7362de 100644
--- a/usb-gadget-fix-up-comment.patch
+++ b/applied/usb-gadget-fix-up-comment.patch
diff --git a/usb-isp116x-remove-dependency-on-config_usb_debug.patch b/applied/usb-isp116x-remove-dependency-on-config_usb_debug.patch
index 6877cbfe4253d1..6877cbfe4253d1 100644
--- a/usb-isp116x-remove-dependency-on-config_usb_debug.patch
+++ b/applied/usb-isp116x-remove-dependency-on-config_usb_debug.patch
diff --git a/usb-isp1362-move-debug-files-from-proc-to-debugfs.patch b/applied/usb-isp1362-move-debug-files-from-proc-to-debugfs.patch
index ed2cece0f0e113..57cbeffbff4461 100644
--- a/usb-isp1362-move-debug-files-from-proc-to-debugfs.patch
+++ b/applied/usb-isp1362-move-debug-files-from-proc-to-debugfs.patch
@@ -72,7 +72,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +static int isp1362_open(struct inode *inode, struct file *file)
  {
 -	return single_open(file, proc_isp1362_show, PDE_DATA(inode));
-+	return single_open(file, isp1362_show, PDE_DATA(inode));
++	return single_open(file, isp1362_show, inode);
  }
  
 -static const struct file_operations proc_ops = {
diff --git a/usb-isp1362-remove-_dbg-usage.patch b/applied/usb-isp1362-remove-_dbg-usage.patch
index ba87fd83f214fd..ba87fd83f214fd 100644
--- a/usb-isp1362-remove-_dbg-usage.patch
+++ b/applied/usb-isp1362-remove-_dbg-usage.patch
diff --git a/usb-isp1362-remove-config_usb_debug-dependency.patch b/applied/usb-isp1362-remove-config_usb_debug-dependency.patch
index 2b3733b45382b2..2b3733b45382b2 100644
--- a/usb-isp1362-remove-config_usb_debug-dependency.patch
+++ b/applied/usb-isp1362-remove-config_usb_debug-dependency.patch
diff --git a/usb-isp1362-remove-unused-_bug_on-calls.patch b/applied/usb-isp1362-remove-unused-_bug_on-calls.patch
index c1d3e7fc8277d3..c1d3e7fc8277d3 100644
--- a/usb-isp1362-remove-unused-_bug_on-calls.patch
+++ b/applied/usb-isp1362-remove-unused-_bug_on-calls.patch
diff --git a/usb-isp1362-remove-unused-_warn_on-calls.patch b/applied/usb-isp1362-remove-unused-_warn_on-calls.patch
index dc110f20767024..dc110f20767024 100644
--- a/usb-isp1362-remove-unused-_warn_on-calls.patch
+++ b/applied/usb-isp1362-remove-unused-_warn_on-calls.patch
diff --git a/usb-ldusb-remove-custom-dbg_info-macro.patch b/applied/usb-ldusb-remove-custom-dbg_info-macro.patch
index ebb53dde670bad..ebb53dde670bad 100644
--- a/usb-ldusb-remove-custom-dbg_info-macro.patch
+++ b/applied/usb-ldusb-remove-custom-dbg_info-macro.patch
diff --git a/usb-legotower-remove-custom-debug-macro-and-module-parameter.patch b/applied/usb-legotower-remove-custom-debug-macro-and-module-parameter.patch
index b2ac3a9adb1445..b2ac3a9adb1445 100644
--- a/usb-legotower-remove-custom-debug-macro-and-module-parameter.patch
+++ b/applied/usb-legotower-remove-custom-debug-macro-and-module-parameter.patch
diff --git a/usb-legotower-remove-direct-calls-to-printk.patch b/applied/usb-legotower-remove-direct-calls-to-printk.patch
index de03d6ee712f12..de03d6ee712f12 100644
--- a/usb-legotower-remove-direct-calls-to-printk.patch
+++ b/applied/usb-legotower-remove-direct-calls-to-printk.patch
diff --git a/usb-legotower-remove-unneeded-tracing-macros.patch b/applied/usb-legotower-remove-unneeded-tracing-macros.patch
index 2a1566fa382755..2a1566fa382755 100644
--- a/usb-legotower-remove-unneeded-tracing-macros.patch
+++ b/applied/usb-legotower-remove-unneeded-tracing-macros.patch
diff --git a/usb-legousbtower-remove-custom-debug-macro.patch b/applied/usb-legousbtower-remove-custom-debug-macro.patch
index 20e64efbc0d07e..20e64efbc0d07e 100644
--- a/usb-legousbtower-remove-custom-debug-macro.patch
+++ b/applied/usb-legousbtower-remove-custom-debug-macro.patch
diff --git a/usb-misc-remove-config_usb_debug-from-makefile.patch b/applied/usb-misc-remove-config_usb_debug-from-makefile.patch
index 9ad231911543d0..9ad231911543d0 100644
--- a/usb-misc-remove-config_usb_debug-from-makefile.patch
+++ b/applied/usb-misc-remove-config_usb_debug-from-makefile.patch
diff --git a/usb-phy-remove-config_usb_debug-usage.patch b/applied/usb-phy-remove-config_usb_debug-usage.patch
index e30581cbf501a5..e30581cbf501a5 100644
--- a/usb-phy-remove-config_usb_debug-usage.patch
+++ b/applied/usb-phy-remove-config_usb_debug-usage.patch
diff --git a/usb-phy-remove-custom-dbg-macro.patch b/applied/usb-phy-remove-custom-dbg-macro.patch
index 603d7e91af778c..603d7e91af778c 100644
--- a/usb-phy-remove-custom-dbg-macro.patch
+++ b/applied/usb-phy-remove-custom-dbg-macro.patch
diff --git a/usb-remove-unneeded-idr.h-include.patch b/applied/usb-remove-unneeded-idr.h-include.patch
index 4bfa7718e5cac9..3a5082c2d6b8cd 100644
--- a/usb-remove-unneeded-idr.h-include.patch
+++ b/applied/usb-remove-unneeded-idr.h-include.patch
@@ -10,21 +10,10 @@ Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
 Cc: Felipe Balbi <balbi@ti.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/usb/chipidea/core.c  |    1 -
  drivers/usb/core/endpoint.c  |    1 -
  drivers/usb/musb/musb_core.c |    1 -
- 3 files changed, 3 deletions(-)
+ 2 files changed, 2 deletions(-)
 
---- a/drivers/usb/chipidea/core.c
-+++ b/drivers/usb/chipidea/core.c
-@@ -53,7 +53,6 @@
- #include <linux/dma-mapping.h>
- #include <linux/platform_device.h>
- #include <linux/module.h>
--#include <linux/idr.h>
- #include <linux/interrupt.h>
- #include <linux/io.h>
- #include <linux/kernel.h>
 --- a/drivers/usb/core/endpoint.c
 +++ b/drivers/usb/core/endpoint.c
 @@ -12,7 +12,6 @@
diff --git a/usb-sl811-move-debug-files-from-proc-to-debugfs.patch b/applied/usb-sl811-move-debug-files-from-proc-to-debugfs.patch
index a18f57fd2a479f..a18f57fd2a479f 100644
--- a/usb-sl811-move-debug-files-from-proc-to-debugfs.patch
+++ b/applied/usb-sl811-move-debug-files-from-proc-to-debugfs.patch
diff --git a/usb-sl811-remove-config_usb_debug-dependency.patch b/applied/usb-sl811-remove-config_usb_debug-dependency.patch
index 3da1ebf5f97738..3da1ebf5f97738 100644
--- a/usb-sl811-remove-config_usb_debug-dependency.patch
+++ b/applied/usb-sl811-remove-config_usb_debug-dependency.patch
diff --git a/usb-usbatm-don-t-rely-on-config_usb_debug.patch b/applied/usb-usbatm-don-t-rely-on-config_usb_debug.patch
index dc6ff519a37a32..dc6ff519a37a32 100644
--- a/usb-usbatm-don-t-rely-on-config_usb_debug.patch
+++ b/applied/usb-usbatm-don-t-rely-on-config_usb_debug.patch
diff --git a/usb-usbatm-move-the-atm_dbg-call-to-use-dynamic-debug.patch b/applied/usb-usbatm-move-the-atm_dbg-call-to-use-dynamic-debug.patch
index e2b15aa5168699..e2b15aa5168699 100644
--- a/usb-usbatm-move-the-atm_dbg-call-to-use-dynamic-debug.patch
+++ b/applied/usb-usbatm-move-the-atm_dbg-call-to-use-dynamic-debug.patch
diff --git a/usb-usbatm-remove-config_usb_debug-dependancy.patch b/applied/usb-usbatm-remove-config_usb_debug-dependancy.patch
index 3d22ffa838db00..3d22ffa838db00 100644
--- a/usb-usbatm-remove-config_usb_debug-dependancy.patch
+++ b/applied/usb-usbatm-remove-config_usb_debug-dependancy.patch
diff --git a/usb-usbatm-remove-unneeded-trace-printk-calls.patch b/applied/usb-usbatm-remove-unneeded-trace-printk-calls.patch
index 47744072df983c..47744072df983c 100644
--- a/usb-usbatm-remove-unneeded-trace-printk-calls.patch
+++ b/applied/usb-usbatm-remove-unneeded-trace-printk-calls.patch
diff --git a/usb-usbatm-remove-unused-udsl_assert-macro.patch b/applied/usb-usbatm-remove-unused-udsl_assert-macro.patch
index 38b083e56f607f..38b083e56f607f 100644
--- a/usb-usbatm-remove-unused-udsl_assert-macro.patch
+++ b/applied/usb-usbatm-remove-unused-udsl_assert-macro.patch
diff --git a/driver-core-remove-dev_attrs-from-struct-class.patch b/driver-core-remove-dev_attrs-from-struct-class.patch
index 5c1f58be3df8f0..bea741a07f5754 100644
--- a/driver-core-remove-dev_attrs-from-struct-class.patch
+++ b/driver-core-remove-dev_attrs-from-struct-class.patch
@@ -10,9 +10,8 @@ dev_groups, we can safely remove dev_attrs from struct class.
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
  drivers/base/core.c    |   38 +-------------------------------------
- drivers/pwm/sysfs.c    |   21 ++++++++++++---------
  include/linux/device.h |    2 --
- 3 files changed, 13 insertions(+), 48 deletions(-)
+ 2 files changed, 1 insertion(+), 39 deletions(-)
 
 --- a/drivers/base/core.c
 +++ b/drivers/base/core.c
@@ -84,55 +83,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  		device_remove_bin_attributes(dev, class->dev_bin_attrs);
  		device_remove_groups(dev, class->dev_groups);
  	}
---- a/drivers/pwm/sysfs.c
-+++ b/drivers/pwm/sysfs.c
-@@ -268,6 +268,7 @@ static ssize_t pwm_export_store(struct d
- 
- 	return ret ? : len;
- }
-+static DEVICE_ATTR(export, 0200, NULL, pwm_export_store);
- 
- static ssize_t pwm_unexport_store(struct device *parent,
- 				  struct device_attribute *attr,
-@@ -288,27 +289,29 @@ static ssize_t pwm_unexport_store(struct
- 
- 	return ret ? : len;
- }
-+static DEVICE_ATTR(unexport, 0200, NULL, pwm_unexport_store);
- 
--static ssize_t pwm_npwm_show(struct device *parent,
--			     struct device_attribute *attr,
--			     char *buf)
-+static ssize_t npwm_show(struct device *parent, struct device_attribute *attr,
-+			 char *buf)
- {
- 	const struct pwm_chip *chip = dev_get_drvdata(parent);
- 
- 	return sprintf(buf, "%u\n", chip->npwm);
- }
-+static DEVICE_ATTR_RO(npwm);
- 
--static struct device_attribute pwm_chip_attrs[] = {
--	__ATTR(export, 0200, NULL, pwm_export_store),
--	__ATTR(unexport, 0200, NULL, pwm_unexport_store),
--	__ATTR(npwm, 0444, pwm_npwm_show, NULL),
--	__ATTR_NULL,
-+static struct attribute *pwm_chip_attrs[] = {
-+	&dev_attr_export.attr,
-+	&dev_attr_unexport.attr,
-+	&dev_attr_npwm.attr,
-+	NULL,
- };
-+ATTRIBUTE_GROUPS(pwm_chip);
- 
- static struct class pwm_class = {
- 	.name		= "pwm",
- 	.owner		= THIS_MODULE,
--	.dev_attrs	= pwm_chip_attrs,
-+	.dev_groups	= pwm_chip_groups,
- };
- 
- static int pwmchip_sysfs_match(struct device *parent, const void *data)
 --- a/include/linux/device.h
 +++ b/include/linux/device.h
 @@ -321,7 +321,6 @@ int subsys_virtual_register(struct bus_t
diff --git a/pwm-convert-class-code-to-use-dev_groups.patch b/pwm-convert-class-code-to-use-dev_groups.patch
new file mode 100644
index 00000000000000..ec507cc32af9dc
--- /dev/null
+++ b/pwm-convert-class-code-to-use-dev_groups.patch
@@ -0,0 +1,65 @@
+From foo@baz Wed Jul 24 14:30:57 PDT 2013
+Date: Wed, 24 Jul 2013 14:30:57 -0700
+To: Greg KH <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Subject: pwm: convert class code to use dev_groups
+
+The dev_attrs field of struct class is going away soon, dev_groups
+should be used instead.  This converts the pwm class code to use the
+correct field.
+
+Cc: Thierry Reding <thierry.reding@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/pwm/sysfs.c |   21 ++++++++++++---------
+ 1 file changed, 12 insertions(+), 9 deletions(-)
+
+--- a/drivers/pwm/sysfs.c
++++ b/drivers/pwm/sysfs.c
+@@ -268,6 +268,7 @@ static ssize_t pwm_export_store(struct d
+ 
+ 	return ret ? : len;
+ }
++static DEVICE_ATTR(export, 0200, NULL, pwm_export_store);
+ 
+ static ssize_t pwm_unexport_store(struct device *parent,
+ 				  struct device_attribute *attr,
+@@ -288,27 +289,29 @@ static ssize_t pwm_unexport_store(struct
+ 
+ 	return ret ? : len;
+ }
++static DEVICE_ATTR(unexport, 0200, NULL, pwm_unexport_store);
+ 
+-static ssize_t pwm_npwm_show(struct device *parent,
+-			     struct device_attribute *attr,
+-			     char *buf)
++static ssize_t npwm_show(struct device *parent, struct device_attribute *attr,
++			 char *buf)
+ {
+ 	const struct pwm_chip *chip = dev_get_drvdata(parent);
+ 
+ 	return sprintf(buf, "%u\n", chip->npwm);
+ }
++static DEVICE_ATTR_RO(npwm);
+ 
+-static struct device_attribute pwm_chip_attrs[] = {
+-	__ATTR(export, 0200, NULL, pwm_export_store),
+-	__ATTR(unexport, 0200, NULL, pwm_unexport_store),
+-	__ATTR(npwm, 0444, pwm_npwm_show, NULL),
+-	__ATTR_NULL,
++static struct attribute *pwm_chip_attrs[] = {
++	&dev_attr_export.attr,
++	&dev_attr_unexport.attr,
++	&dev_attr_npwm.attr,
++	NULL,
+ };
++ATTRIBUTE_GROUPS(pwm_chip);
+ 
+ static struct class pwm_class = {
+ 	.name		= "pwm",
+ 	.owner		= THIS_MODULE,
+-	.dev_attrs	= pwm_chip_attrs,
++	.dev_groups	= pwm_chip_groups,
+ };
+ 
+ static int pwmchip_sysfs_match(struct device *parent, const void *data)
diff --git a/series b/series
index c203b65ca5f9e4..949f144c4ec3bc 100644
--- a/series
+++ b/series
@@ -1,9 +1,44 @@
+# patches already in my git trees, but still here so I don't loose them.
+applied/misc-c2port-use-dev_bin_attrs-instead-of-hand-coding-it.patch
+
+# usb DEBUG cleanups
+applied/usb-ldusb-remove-custom-dbg_info-macro.patch
+applied/usb-legotower-remove-unneeded-tracing-macros.patch
+applied/usb-legousbtower-remove-custom-debug-macro.patch
+applied/usb-legotower-remove-custom-debug-macro-and-module-parameter.patch
+applied/usb-legotower-remove-direct-calls-to-printk.patch
+applied/usb-adutux-remove-unneeded-tracing-macros.patch
+applied/usb-adutux-remove-custom-debug-macro.patch
+applied/usb-adutux-remove-custom-debug-macro-and-module-parameter.patch
+applied/usb-adutux-remove-direct-calls-to-printk.patch
+applied/usb-misc-remove-config_usb_debug-from-makefile.patch
+
+applied/usb-usbatm-remove-unused-udsl_assert-macro.patch
+applied/usb-usbatm-remove-unneeded-trace-printk-calls.patch
+applied/usb-usbatm-don-t-rely-on-config_usb_debug.patch
+applied/usb-usbatm-move-the-atm_dbg-call-to-use-dynamic-debug.patch
+applied/usb-usbatm-remove-config_usb_debug-dependancy.patch
+
+applied/usb-phy-remove-custom-dbg-macro.patch
+applied/usb-phy-remove-config_usb_debug-usage.patch
+applied/usb-gadget-fix-up-comment.patch
+applied/usb-isp1362-remove-unused-_bug_on-calls.patch
+applied/usb-isp1362-remove-unused-_warn_on-calls.patch
+applied/usb-isp1362-remove-_dbg-usage.patch
+applied/usb-isp1362-remove-config_usb_debug-dependency.patch
+applied/usb-isp116x-remove-dependency-on-config_usb_debug.patch
+applied/usb-sl811-remove-config_usb_debug-dependency.patch
+
+applied/usb-remove-unneeded-idr.h-include.patch
+applied/usb-sl811-move-debug-files-from-proc-to-debugfs.patch
+applied/usb-isp1362-move-debug-files-from-proc-to-debugfs.patch
+
 # My specific stuff, at the top to make it easier to work stuff below.
 
 # driver core attribute cleanup work
 
 # dev_groups to struct class work
-misc-c2port-use-dev_bin_attrs-instead-of-hand-coding-it.patch
+
 mips-convert-vpe_class-to-use-dev_groups.patch
 bsr-convert-bsr_class-to-use-dev_groups.patch
 tile-srom-convert-srom_class-to-use-dev_groups.patch
@@ -36,43 +71,13 @@ net-core-convert-class-code-to-use-dev_groups.patch
 net-ieee802154-convert-class-code-to-use-dev_groups.patch
 net-wireless-convert-class-code-to-use-dev_groups.patch
 net-rfkill-convert-class-code-to-use-dev_groups.patch
-
 c2port-convert-class-code-to-use-bin_attrs-in-groups.patch
 hid-roccat-convert-class-code-to-use-bin_attrs-in-groups.patch
+pwm-convert-class-code-to-use-dev_groups.patch
 
 driver-core-remove-dev_attrs-from-struct-class.patch
 driver-core-remove-dev_bin_attrs-from-struct-class.patch
 
-# usb DEBUG cleanups
-usb-ldusb-remove-custom-dbg_info-macro.patch
-usb-legotower-remove-unneeded-tracing-macros.patch
-usb-legousbtower-remove-custom-debug-macro.patch
-usb-legotower-remove-custom-debug-macro-and-module-parameter.patch
-usb-legotower-remove-direct-calls-to-printk.patch
-usb-adutux-remove-unneeded-tracing-macros.patch
-usb-adutux-remove-custom-debug-macro.patch
-usb-adutux-remove-custom-debug-macro-and-module-parameter.patch
-usb-adutux-remove-direct-calls-to-printk.patch
-usb-misc-remove-config_usb_debug-from-makefile.patch
-
-usb-usbatm-remove-unused-udsl_assert-macro.patch
-usb-usbatm-remove-unneeded-trace-printk-calls.patch
-usb-usbatm-don-t-rely-on-config_usb_debug.patch
-usb-usbatm-move-the-atm_dbg-call-to-use-dynamic-debug.patch
-usb-usbatm-remove-config_usb_debug-dependancy.patch
-usb-phy-remove-custom-dbg-macro.patch
-usb-phy-remove-config_usb_debug-usage.patch
-usb-gadget-fix-up-comment.patch
-usb-isp1362-remove-unused-_bug_on-calls.patch
-usb-isp1362-remove-unused-_warn_on-calls.patch
-usb-isp1362-remove-_dbg-usage.patch
-usb-isp1362-remove-config_usb_debug-dependency.patch
-usb-isp116x-remove-dependency-on-config_usb_debug.patch
-usb-sl811-remove-config_usb_debug-dependency.patch
-
-usb-remove-unneeded-idr.h-include.patch
-usb-sl811-move-debug-files-from-proc-to-debugfs.patch
-usb-isp1362-move-debug-files-from-proc-to-debugfs.patch
 
 0001-Simulate-fake-Fn-key-on-PS-2-keyboards-w-o-one-eg.-C.patch