diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-09 16:25:01 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-09 16:25:01 -0700 |
| commit | 42bf72faa914ffb16c345329260bc54f15461036 (patch) | |
| tree | 8de3b15e3520388cfaab58bccc2cd655de49336a | |
| parent | 34a96ad13a22680781ae77e8065c2f96a3d1e43e (diff) | |
| download | patches-42bf72faa914ffb16c345329260bc54f15461036.tar.gz | |
renamed the final broken out patches
| -rw-r--r-- | net-core-convert-class-code-to-use-dev_groups.patch (renamed from d2.patch) | 18 | ||||
| -rw-r--r-- | net-ieee802154-convert-class-code-to-use-dev_groups.patch (renamed from d3.patch) | 16 | ||||
| -rw-r--r-- | net-rfkill-convert-class-code-to-use-dev_groups.patch (renamed from d5.patch) | 16 | ||||
| -rw-r--r-- | net-wireless-convert-class-code-to-use-dev_groups.patch (renamed from d4.patch) | 16 | ||||
| -rw-r--r-- | series | 17 | ||||
| -rw-r--r-- | video-output-convert-class-code-to-use-dev_groups.patch (renamed from d1.patch) | 14 |
6 files changed, 89 insertions, 8 deletions
diff --git a/d2.patch b/net-core-convert-class-code-to-use-dev_groups.patch index bd29f82eb8e2cd..31aecfb7d86d41 100644 --- a/d2.patch +++ b/net-core-convert-class-code-to-use-dev_groups.patch @@ -1,3 +1,21 @@ +From foo@baz Tue Jul 9 16:17:49 PDT 2013 +Date: Tue, 09 Jul 2013 16:17:49 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: net: core: 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 networking core class code to +use the correct field. + +In order to do this in the "cleanest" way, some of the macros had to be +changed to reflect the driver core format of naming show/store +functions, which accounts for the majority of the churn in this file. + +Cc: netdev@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + + --- net/core/net-sysfs.c | 134 ++++++++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 60 deletions(-) diff --git a/d3.patch b/net-ieee802154-convert-class-code-to-use-dev_groups.patch index 2a56c6724a2625..53d0526a29b7a2 100644 --- a/d3.patch +++ b/net-ieee802154-convert-class-code-to-use-dev_groups.patch @@ -1,3 +1,19 @@ +From foo@baz Tue Jul 9 16:20:29 PDT 2013 +Date: Tue, 09 Jul 2013 16:20:29 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: net: ieee802154: 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 ieee802154 class code to use +the correct field. + +Cc: Alexander Smirnov <alex.bluesman.smirnov@gmail.com> +Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> +Cc: netdev@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + + --- net/ieee802154/wpan-class.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/d5.patch b/net-rfkill-convert-class-code-to-use-dev_groups.patch index f1d5ca40573d7c..71f66e171bacf6 100644 --- a/d5.patch +++ b/net-rfkill-convert-class-code-to-use-dev_groups.patch @@ -1,3 +1,19 @@ +From foo@baz Tue Jul 9 16:22:33 PDT 2013 +Date: Tue, 09 Jul 2013 16:22:33 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: net: rfkill: 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 rfkill class code to use the +correct field. + +Cc: Johannes Berg <johannes@sipsolutions.net> +Cc: John W. Linville <linville@tuxdriver.com> +Cc: linux-wireless@vger.kernel.org +Cc: netdev@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + --- net/rfkill/core.c | 88 ++++++++++++++++++++++++------------------------------ 1 file changed, 40 insertions(+), 48 deletions(-) diff --git a/d4.patch b/net-wireless-convert-class-code-to-use-dev_groups.patch index b05fc0ca61deb1..37575248a080ba 100644 --- a/d4.patch +++ b/net-wireless-convert-class-code-to-use-dev_groups.patch @@ -1,3 +1,19 @@ +From foo@baz Tue Jul 9 16:21:34 PDT 2013 +Date: Tue, 09 Jul 2013 16:21:34 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: net: wireless: 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 networking wireless class +code to use the correct field. + +Cc: Johannes Berg <johannes@sipsolutions.net> +Cc: John W. Linville <linville@tuxdriver.com> +Cc: linux-wireless@vger.kernel.org +Cc: netdev@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + --- net/wireless/sysfs.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) @@ -1,10 +1,13 @@ # My specific stuff, at the top to make it easier to work stuff below. + +# driver core attribute cleanup work sysfs.h-add-__attr_rw-macro.patch sysfs.h-add-attribute_groups-macro.patch driver-core-add-device_attr_rw-and-device_attr_ro-macros.patch driver-core-add-binary-attributes-to-struct-device.patch misc-c2port-use-dev_bin_attrs-instead-of-hand-coding-it.patch +# dev_groups to struct class work driver-core-add-default-groups-to-struct-class.patch driver-core-remove-dev_attrs-from-struct-class.patch mips-convert-vpe_class-to-use-dev_groups.patch @@ -34,16 +37,14 @@ scsi-sd-convert-class-code-to-use-dev_groups.patch scsi-st-convert-class-code-to-use-dev_groups.patch video-backlight-convert-class-code-to-use-dev_groups.patch video-backlight-lcd-convert-class-code-to-use-dev_groups.patch +video-output-convert-class-code-to-use-dev_groups.patch +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 - -d1.patch -d2.patch -d3.patch -d4.patch -d5.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 diff --git a/d1.patch b/video-output-convert-class-code-to-use-dev_groups.patch index 776bd82d31b325..45756ed596e286 100644 --- a/d1.patch +++ b/video-output-convert-class-code-to-use-dev_groups.patch @@ -1,3 +1,17 @@ +From foo@baz Tue Jul 9 16:16:53 PDT 2013 +Date: Tue, 09 Jul 2013 16:16:53 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: video: output: 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 video output class code to +use the correct field. + +Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> +Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + --- drivers/video/output.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) |