diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-05-15 01:49:19 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-05-15 01:49:19 +0200 |
commit | 879f99ef2c4c05d9a7f0a67a05f1415663119825 (patch) | |
tree | 0399664761f675eef741f8b08b92635069586151 /drivers/w1/w1_family.h | |
parent | Input: pmic8xxx-pwrkey - set sane default for debounce time (diff) | |
parent | Linux 3.15-rc5 (diff) | |
download | linux-879f99ef2c4c05d9a7f0a67a05f1415663119825.tar.xz linux-879f99ef2c4c05d9a7f0a67a05f1415663119825.zip |
Merge tag 'v3.15-rc5' into next
Merge with Linux 3.15-rc5 to sync up Wacom and other changes.
Diffstat (limited to 'drivers/w1/w1_family.h')
-rw-r--r-- | drivers/w1/w1_family.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/w1/w1_family.h b/drivers/w1/w1_family.h index 4ad0e81b6404..26ca1343055b 100644 --- a/drivers/w1/w1_family.h +++ b/drivers/w1/w1_family.h @@ -48,6 +48,12 @@ struct w1_slave; +/** + * struct w1_family_ops - operations for a family type + * @add_slave: add_slave + * @remove_slave: remove_slave + * @groups: sysfs group + */ struct w1_family_ops { int (* add_slave)(struct w1_slave *); @@ -55,6 +61,13 @@ struct w1_family_ops const struct attribute_group **groups; }; +/** + * struct w1_family - reference counted family structure. + * @family_entry: family linked list + * @fid: 8 bit family identifier + * @fops: operations for this family + * @refcnt: reference counter + */ struct w1_family { struct list_head family_entry; |