Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 286616
b: refs/heads/master
c: 2eda013
h: refs/heads/master
v: v3
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed Jan 23, 2012
1 parent 66ab349 commit bb4860e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b5763accd3b5fc131ee06e26ce56e63ae0322c9b
refs/heads/master: 2eda013f4894bc200124f791a56c4defb613a0cc
15 changes: 10 additions & 5 deletions trunk/include/linux/device.h
Original file line number Diff line number Diff line change
Expand Up @@ -279,11 +279,11 @@ struct device *driver_find_device(struct device_driver *drv,

/**
* struct subsys_interface - interfaces to device functions
* @name name of the device function
* @subsystem subsytem of the devices to attach to
* @node the list of functions registered at the subsystem
* @add device hookup to device function handler
* @remove device hookup to device function handler
* @name: name of the device function
* @subsys: subsytem of the devices to attach to
* @node: the list of functions registered at the subsystem
* @add_dev: device hookup to device function handler
* @remove_dev: device hookup to device function handler
*
* Simple interfaces attached to a subsystem. Multiple interfaces can
* attach to a subsystem and its devices. Unlike drivers, they do not
Expand Down Expand Up @@ -612,6 +612,7 @@ struct device_dma_parameters {
* @archdata: For arch-specific additions.
* @of_node: Associated device tree node.
* @devt: For creating the sysfs "dev".
* @id: device instance
* @devres_lock: Spinlock to protect the resource of the device.
* @devres_head: The resources list of the device.
* @knode_class: The node used to add the device to the class list.
Expand Down Expand Up @@ -1003,6 +1004,10 @@ extern long sysfs_deprecated;
* Each module may only use this macro once, and calling it replaces
* module_init() and module_exit().
*
* @__driver: driver name
* @__register: register function for this driver type
* @__unregister: unregister function for this driver type
*
* Use this macro to construct bus specific macros for registering
* drivers, and do not use it on its own.
*/
Expand Down

0 comments on commit bb4860e

Please sign in to comment.