diff options
| -rw-r--r-- | p01.patch | 2 | ||||
| -rw-r--r-- | pci-convert-bus-code-to-use-bus_groups.patch | 2 | ||||
| -rw-r--r-- | qlcnic_sysfs.patch | 6 | ||||
| -rw-r--r-- | series | 1 | ||||
| -rw-r--r-- | video-output-convert-class-code-to-use-dev_groups.patch | 73 |
5 files changed, 5 insertions, 79 deletions
diff --git a/p01.patch b/p01.patch index f535a900fc87b6..9220c31421eecf 100644 --- a/p01.patch +++ b/p01.patch @@ -194,7 +194,7 @@ static struct attribute *pcibus_attrs[] = { --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h -@@ -150,7 +150,7 @@ static inline int pci_no_d1d2(struct pci +@@ -153,7 +153,7 @@ static inline int pci_no_d1d2(struct pci return (dev->no_d1d2 || parent_dstates); } diff --git a/pci-convert-bus-code-to-use-bus_groups.patch b/pci-convert-bus-code-to-use-bus_groups.patch index 98ffc32b58d4c2..f71d9b11507c51 100644 --- a/pci-convert-bus-code-to-use-bus_groups.patch +++ b/pci-convert-bus-code-to-use-bus_groups.patch @@ -55,7 +55,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> static ssize_t --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h -@@ -153,7 +153,7 @@ static inline int pci_no_d1d2(struct pci +@@ -156,7 +156,7 @@ static inline int pci_no_d1d2(struct pci extern struct device_attribute pci_dev_attrs[]; extern const struct attribute_group *pcibus_groups[]; extern struct device_type pci_dev_type; diff --git a/qlcnic_sysfs.patch b/qlcnic_sysfs.patch index 1905df3aef1477..a09cec0cc9dd11 100644 --- a/qlcnic_sysfs.patch +++ b/qlcnic_sysfs.patch @@ -91,7 +91,7 @@ static ssize_t qlcnic_sysfs_read_crb(struct file *filp, struct kobject *kobj, struct bin_attribute *attr, char *buf, -@@ -1155,24 +1156,6 @@ static ssize_t qlcnic_83xx_sysfs_flash_w +@@ -1170,24 +1171,6 @@ static ssize_t qlcnic_83xx_sysfs_flash_w return size; } @@ -116,7 +116,7 @@ static struct bin_attribute bin_attr_crb = { .attr = {.name = "crb", .mode = (S_IRUGO | S_IWUSR)}, .size = 0, -@@ -1236,6 +1219,24 @@ static struct bin_attribute bin_attr_fla +@@ -1251,6 +1234,24 @@ static struct bin_attribute bin_attr_fla .write = qlcnic_83xx_sysfs_flash_write_handler, }; @@ -141,7 +141,7 @@ void qlcnic_create_sysfs_entries(struct qlcnic_adapter *adapter) { struct device *dev = &adapter->pdev->dev; -@@ -1257,6 +1258,11 @@ void qlcnic_remove_sysfs_entries(struct +@@ -1272,6 +1273,11 @@ void qlcnic_remove_sysfs_entries(struct void qlcnic_create_diag_entries(struct qlcnic_adapter *adapter) { struct device *dev = &adapter->pdev->dev; @@ -14,7 +14,6 @@ serial-8250_pci-add-support-for-fintek-4-8-and-12-port-cards.patch # dev_groups to struct class work -video-output-convert-class-code-to-use-dev_groups.patch diff --git a/video-output-convert-class-code-to-use-dev_groups.patch b/video-output-convert-class-code-to-use-dev_groups.patch deleted file mode 100644 index 45756ed596e286..00000000000000 --- a/video-output-convert-class-code-to-use-dev_groups.patch +++ /dev/null @@ -1,73 +0,0 @@ -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(-) - ---- a/drivers/video/output.c -+++ b/drivers/video/output.c -@@ -32,8 +32,8 @@ MODULE_DESCRIPTION("Display Output Switc - MODULE_LICENSE("GPL"); - MODULE_AUTHOR("Luming Yu <luming.yu@intel.com>"); - --static ssize_t video_output_show_state(struct device *dev, -- struct device_attribute *attr, char *buf) -+static ssize_t state_show(struct device *dev, struct device_attribute *attr, -+ char *buf) - { - ssize_t ret_size = 0; - struct output_device *od = to_output_device(dev); -@@ -42,9 +42,8 @@ static ssize_t video_output_show_state(s - return ret_size; - } - --static ssize_t video_output_store_state(struct device *dev, -- struct device_attribute *attr, -- const char *buf,size_t count) -+static ssize_t state_store(struct device *dev, struct device_attribute *attr, -+ const char *buf,size_t count) - { - char *endp; - struct output_device *od = to_output_device(dev); -@@ -62,6 +61,7 @@ static ssize_t video_output_store_state( - } - return count; - } -+static DEVICE_ATTR_RW(state); - - static void video_output_release(struct device *dev) - { -@@ -69,16 +69,16 @@ static void video_output_release(struct - kfree(od); - } - --static struct device_attribute video_output_attributes[] = { -- __ATTR(state, 0644, video_output_show_state, video_output_store_state), -- __ATTR_NULL, -+static struct attribute *video_output_attrs[] = { -+ &dev_attr_state.attr, -+ NULL, - }; -- -+ATTRIBUTE_GROUPS(video_output); - - static struct class video_output_class = { - .name = "video_output", - .dev_release = video_output_release, -- .dev_attrs = video_output_attributes, -+ .dev_groups = video_output_groups, - }; - - struct output_device *video_output_register(const char *name, |