diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-04 13:07:52 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-04 13:07:52 -0700 |
| commit | bbcc0c699929d3b01ecf3066a35799defe733dd2 (patch) | |
| tree | 5fd368175f54e652b663ebd33dc78e174a288445 /pwm-convert-class-code-to-use-dev_groups.patch | |
| parent | cba9545b635d1566060d5a8f1a9dc78680f4e839 (diff) | |
| download | patches-bbcc0c699929d3b01ecf3066a35799defe733dd2.tar.gz | |
remove a bunch of patches now in Linus's tree
Diffstat (limited to 'pwm-convert-class-code-to-use-dev_groups.patch')
| -rw-r--r-- | pwm-convert-class-code-to-use-dev_groups.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/pwm-convert-class-code-to-use-dev_groups.patch b/pwm-convert-class-code-to-use-dev_groups.patch deleted file mode 100644 index ec507cc32af9dc..00000000000000 --- a/pwm-convert-class-code-to-use-dev_groups.patch +++ /dev/null @@ -1,65 +0,0 @@ -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) |