diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-26 23:24:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-26 23:24:39 -0700 |
| commit | 2fc5ddaa3f1f1d7a1f7f455e287e97bf298ab8d7 (patch) | |
| tree | 32eaac100f3771da334173fa9e5a63193463f24b /drivers/hwtracing/intel_th/intel_th.h | |
| parent | 7553c7e68fd144643e74a279ef51b74a15214071 (diff) | |
| parent | aaa3ca82286d53c5409d2c22204426c9ca419d8c (diff) | |
| download | linux-stable-2fc5ddaa3f1f1d7a1f7f455e287e97bf298ab8d7.tar.gz linux-stable-2fc5ddaa3f1f1d7a1f7f455e287e97bf298ab8d7.tar.bz2 linux-stable-2fc5ddaa3f1f1d7a1f7f455e287e97bf298ab8d7.zip | |
Merge tag 'stm-for-greg-20160420' of git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm into char-misc-next
Alexander writes:
stm class/intel_th: Updates for 4.7
These are:
* Intel TH/MSU: improved resource handling and releasing
* Intel TH/MSU: rehashed locking around buffer accesses
* Intel TH/outputs: better sysfs group handling
* Intel TH, STM: various bugfixes and smaller improvements
* Intel TH: added a PCI ID for Broxton-M SOC
Diffstat (limited to 'drivers/hwtracing/intel_th/intel_th.h')
| -rw-r--r-- | drivers/hwtracing/intel_th/intel_th.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hwtracing/intel_th/intel_th.h b/drivers/hwtracing/intel_th/intel_th.h index eedd09332db6..0df22e30673d 100644 --- a/drivers/hwtracing/intel_th/intel_th.h +++ b/drivers/hwtracing/intel_th/intel_th.h @@ -115,6 +115,7 @@ intel_th_output_assigned(struct intel_th_device *thdev) * @enable: enable tracing for a given output device * @disable: disable tracing for a given output device * @fops: file operations for device nodes + * @attr_group: attributes provided by the driver * * Callbacks @probe and @remove are required for all device types. * Switch device driver needs to fill in @assign, @enable and @disable @@ -139,6 +140,8 @@ struct intel_th_driver { void (*deactivate)(struct intel_th_device *thdev); /* file_operations for those who want a device node */ const struct file_operations *fops; + /* optional attributes */ + struct attribute_group *attr_group; /* source ops */ int (*set_output)(struct intel_th_device *thdev, @@ -148,6 +151,9 @@ struct intel_th_driver { #define to_intel_th_driver(_d) \ container_of((_d), struct intel_th_driver, driver) +#define to_intel_th_driver_or_null(_d) \ + ((_d) ? to_intel_th_driver(_d) : NULL) + static inline struct intel_th_device * to_intel_th_hub(struct intel_th_device *thdev) { |