diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-05-21 11:15:16 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-05-21 11:15:16 -0700 |
commit | 07044b8326f46e2065fcb61084c895670c177742 (patch) | |
tree | c45f70b118cbd122d8bdb6344cfc5367b0b95686 /pending | |
parent | 7087e343bb0bb553b2ad0b81888ffd614e77605e (diff) | |
download | patches-07044b8326f46e2065fcb61084c895670c177742.tar.gz |
remove some old pending/ patches that do not need to stick around anymore
Diffstat (limited to 'pending')
-rw-r--r-- | pending/atm-convert-struct-class_device-to-struct-device.patch | 186 | ||||
-rw-r--r-- | pending/feature-removal-1.patch | 23 | ||||
-rw-r--r-- | pending/feature-removal-2.patch | 40 | ||||
-rw-r--r-- | pending/feature-removal-3.patch | 32 |
4 files changed, 0 insertions, 281 deletions
diff --git a/pending/atm-convert-struct-class_device-to-struct-device.patch b/pending/atm-convert-struct-class_device-to-struct-device.patch deleted file mode 100644 index 41d0ef1f175e04..00000000000000 --- a/pending/atm-convert-struct-class_device-to-struct-device.patch +++ /dev/null @@ -1,186 +0,0 @@ -From kay.sievers@vrfy.org Wed Oct 10 14:21:54 2007 -From: Kay Sievers <kay.sievers@vrfy.org> -Subject: atm: Convert struct class_device to struct device -Date: Tue, 25 Sep 2007 02:03:03 +0200 -Message-Id: <1190678583.3373.23.camel@lov.localdomain> - -Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> -Cc: Tony Jones <tonyj@suse.de> -Cc: Chas Williams <chas@cmf.nrl.navy.mil> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - include/linux/atmdev.h | 4 +- - net/atm/atm_sysfs.c | 66 ++++++++++++++++++++++++++----------------------- - 2 files changed, 38 insertions(+), 32 deletions(-) - ---- a/include/linux/atmdev.h -+++ b/include/linux/atmdev.h -@@ -359,7 +359,7 @@ struct atm_dev { - struct proc_dir_entry *proc_entry; /* proc entry */ - char *proc_name; /* proc entry name */ - #endif -- struct class_device class_dev; /* sysfs class device */ -+ struct device class_dev; /* sysfs device */ - struct list_head dev_list; /* linkage */ - }; - -@@ -461,7 +461,7 @@ static inline void atm_dev_put(struct at - BUG_ON(!test_bit(ATM_DF_REMOVED, &dev->flags)); - if (dev->ops->dev_close) - dev->ops->dev_close(dev); -- class_device_put(&dev->class_dev); -+ put_device(&dev->class_dev); - } - } - ---- a/net/atm/atm_sysfs.c -+++ b/net/atm/atm_sysfs.c -@@ -9,13 +9,15 @@ - - #define to_atm_dev(cldev) container_of(cldev, struct atm_dev, class_dev) - --static ssize_t show_type(struct class_device *cdev, char *buf) -+static ssize_t show_type(struct device *cdev, -+ struct device_attribute *attr, char *buf) - { - struct atm_dev *adev = to_atm_dev(cdev); - return sprintf(buf, "%s\n", adev->type); - } - --static ssize_t show_address(struct class_device *cdev, char *buf) -+static ssize_t show_address(struct device *cdev, -+ struct device_attribute *attr, char *buf) - { - char *pos = buf; - struct atm_dev *adev = to_atm_dev(cdev); -@@ -28,7 +30,8 @@ static ssize_t show_address(struct class - return pos - buf; - } - --static ssize_t show_atmaddress(struct class_device *cdev, char *buf) -+static ssize_t show_atmaddress(struct device *cdev, -+ struct device_attribute *attr, char *buf) - { - unsigned long flags; - char *pos = buf; -@@ -54,7 +57,8 @@ static ssize_t show_atmaddress(struct cl - return pos - buf; - } - --static ssize_t show_carrier(struct class_device *cdev, char *buf) -+static ssize_t show_carrier(struct device *cdev, -+ struct device_attribute *attr, char *buf) - { - char *pos = buf; - struct atm_dev *adev = to_atm_dev(cdev); -@@ -65,7 +69,8 @@ static ssize_t show_carrier(struct class - return pos - buf; - } - --static ssize_t show_link_rate(struct class_device *cdev, char *buf) -+static ssize_t show_link_rate(struct device *cdev, -+ struct device_attribute *attr, char *buf) - { - char *pos = buf; - struct atm_dev *adev = to_atm_dev(cdev); -@@ -90,22 +95,23 @@ static ssize_t show_link_rate(struct cla - return pos - buf; - } - --static CLASS_DEVICE_ATTR(address, S_IRUGO, show_address, NULL); --static CLASS_DEVICE_ATTR(atmaddress, S_IRUGO, show_atmaddress, NULL); --static CLASS_DEVICE_ATTR(carrier, S_IRUGO, show_carrier, NULL); --static CLASS_DEVICE_ATTR(type, S_IRUGO, show_type, NULL); --static CLASS_DEVICE_ATTR(link_rate, S_IRUGO, show_link_rate, NULL); -- --static struct class_device_attribute *atm_attrs[] = { -- &class_device_attr_atmaddress, -- &class_device_attr_address, -- &class_device_attr_carrier, -- &class_device_attr_type, -- &class_device_attr_link_rate, -+static DEVICE_ATTR(address, S_IRUGO, show_address, NULL); -+static DEVICE_ATTR(atmaddress, S_IRUGO, show_atmaddress, NULL); -+static DEVICE_ATTR(carrier, S_IRUGO, show_carrier, NULL); -+static DEVICE_ATTR(type, S_IRUGO, show_type, NULL); -+static DEVICE_ATTR(link_rate, S_IRUGO, show_link_rate, NULL); -+ -+static struct device_attribute *atm_attrs[] = { -+ &dev_attr_atmaddress, -+ &dev_attr_address, -+ &dev_attr_carrier, -+ &dev_attr_type, -+ &dev_attr_link_rate, - NULL - }; - --static int atm_uevent(struct class_device *cdev, struct kobj_uevent_env *env) -+ -+static int atm_uevent(struct device *cdev, struct kobj_uevent_env *env) - { - struct atm_dev *adev; - -@@ -122,7 +128,7 @@ static int atm_uevent(struct class_devic - return 0; - } - --static void atm_release(struct class_device *cdev) -+static void atm_release(struct device *cdev) - { - struct atm_dev *adev = to_atm_dev(cdev); - -@@ -131,25 +137,25 @@ static void atm_release(struct class_dev - - static struct class atm_class = { - .name = "atm", -- .release = atm_release, -- .uevent = atm_uevent, -+ .dev_release = atm_release, -+ .dev_uevent = atm_uevent, - }; - - int atm_register_sysfs(struct atm_dev *adev) - { -- struct class_device *cdev = &adev->class_dev; -+ struct device *cdev = &adev->class_dev; - int i, j, err; - - cdev->class = &atm_class; -- class_set_devdata(cdev, adev); -+ dev_set_drvdata(cdev, adev); - -- snprintf(cdev->class_id, BUS_ID_SIZE, "%s%d", adev->type, adev->number); -- err = class_device_register(cdev); -+ snprintf(cdev->bus_id, BUS_ID_SIZE, "%s%d", adev->type, adev->number); -+ err = device_register(cdev); - if (err < 0) - return err; - - for (i = 0; atm_attrs[i]; i++) { -- err = class_device_create_file(cdev, atm_attrs[i]); -+ err = device_create_file(cdev, atm_attrs[i]); - if (err) - goto err_out; - } -@@ -158,16 +164,16 @@ int atm_register_sysfs(struct atm_dev *a - - err_out: - for (j = 0; j < i; j++) -- class_device_remove_file(cdev, atm_attrs[j]); -- class_device_del(cdev); -+ device_remove_file(cdev, atm_attrs[j]); -+ device_del(cdev); - return err; - } - - void atm_unregister_sysfs(struct atm_dev *adev) - { -- struct class_device *cdev = &adev->class_dev; -+ struct device *cdev = &adev->class_dev; - -- class_device_del(cdev); -+ device_del(cdev); - } - - int __init atm_sysfs_init(void) diff --git a/pending/feature-removal-1.patch b/pending/feature-removal-1.patch deleted file mode 100644 index f7791983070634..00000000000000 --- a/pending/feature-removal-1.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- - Documentation/feature-removal-schedule/README | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - ---- /dev/null -+++ b/Documentation/feature-removal-schedule/README -@@ -0,0 +1,16 @@ -+The files in this directory describe a number of files and features -+that are that are going to be removed in the kernel source tree. Every -+entry should contain what exactly is going away, why it is happening, -+and who is going to be doing the work. When the feature is removed from -+the kernel, the file describing the removal should also be removed. -+ -+The files should use the following template to help explain this -+information: -+ -+--------------------------- -+What: the foo->baz field is going away -+When: October 31, 2038 -+Why: Using this field is broken by design, please switch to using the -+ newer foo->bar field instead. For more details on this, please -+ see the directions in Documentation/foo/using_bar.txt -+Who: Joe Weezle <joe@weezle> diff --git a/pending/feature-removal-2.patch b/pending/feature-removal-2.patch deleted file mode 100644 index 65cf6c3ecac19d..00000000000000 --- a/pending/feature-removal-2.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- - Documentation/feature-removal-schedule.txt | 13 ----------- - Documentation/feature-removal-schedule/dev-power.power_state | 10 ++++++++ - 2 files changed, 10 insertions(+), 13 deletions(-) - ---- a/Documentation/feature-removal-schedule.txt -+++ b/Documentation/feature-removal-schedule.txt -@@ -6,19 +6,6 @@ be removed from this file. - - --------------------------- - --What: dev->power.power_state --When: July 2007 --Why: Broken design for runtime control over driver power states, confusing -- driver-internal runtime power management with: mechanisms to support -- system-wide sleep state transitions; event codes that distinguish -- different phases of swsusp "sleep" transitions; and userspace policy -- inputs. This framework was never widely used, and most attempts to -- use it were broken. Drivers should instead be exposing domain-specific -- interfaces either to kernel or to userspace. --Who: Pavel Machek <pavel@suse.cz> -- ----------------------------- -- - What: old NCR53C9x driver - When: October 2007 - Why: Replaced by the much better esp_scsi driver. Actual low-level ---- /dev/null -+++ b/Documentation/feature-removal-schedule/dev-power.power_state -@@ -0,0 +1,10 @@ -+What: dev->power.power_state -+When: July 2007 -+Why: Broken design for runtime control over driver power states, confusing -+ driver-internal runtime power management with: mechanisms to support -+ system-wide sleep state transitions; event codes that distinguish -+ different phases of swsusp "sleep" transitions; and userspace policy -+ inputs. This framework was never widely used, and most attempts to -+ use it were broken. Drivers should instead be exposing domain-specific -+ interfaces either to kernel or to userspace. -+Who: Pavel Machek <pavel@suse.cz> diff --git a/pending/feature-removal-3.patch b/pending/feature-removal-3.patch deleted file mode 100644 index ed0ab6944196ba..00000000000000 --- a/pending/feature-removal-3.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- - Documentation/feature-removal-schedule.txt | 9 --------- - Documentation/feature-removal-schedule/old_ncr54c9_driver | 6 ++++++ - 2 files changed, 6 insertions(+), 9 deletions(-) - ---- a/Documentation/feature-removal-schedule.txt -+++ b/Documentation/feature-removal-schedule.txt -@@ -6,15 +6,6 @@ be removed from this file. - - --------------------------- - --What: old NCR53C9x driver --When: October 2007 --Why: Replaced by the much better esp_scsi driver. Actual low-level -- driver can be ported over almost trivially. --Who: David Miller <davem@davemloft.net> -- Christoph Hellwig <hch@lst.de> -- ----------------------------- -- - What: Video4Linux API 1 ioctls and video_decoder.h from Video devices. - When: December 2008 - Files: include/linux/video_decoder.h include/linux/videodev.h ---- /dev/null -+++ b/Documentation/feature-removal-schedule/old_ncr54c9_driver -@@ -0,0 +1,6 @@ -+What: old NCR53C9x driver -+When: October 2007 -+Why: Replaced by the much better esp_scsi driver. Actual low-level -+ driver can be ported over almost trivially. -+Who: David Miller <davem@davemloft.net> -+ Christoph Hellwig <hch@lst.de> |