diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 11:02:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 11:02:58 -0700 |
| commit | bb93109e1544e2a4d12c2c35bf1af84c25a2699d (patch) | |
| tree | e60cd9bc1efbaa9500a4ae59cf4f6186eb4ef29e /include | |
| parent | 23e3a1d971f6658de5aa423011c153765f28fe26 (diff) | |
| parent | bcabcfd2e09ceb8599a33001e812e7cbad00fc4d (diff) | |
Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
Pull firewire updates from Stefan Richter:
"Make struct ieee1394_device_id.driver_data actually avaliable to 1394
protocol drivers. This is especially useful to 1394 audio drivers for
model-specific parameters and methods"
* tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
firewire: remove support of fw_driver.driver.probe and .remove methods
firewire: introduce fw_driver.probe and .remove methods
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/firewire.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/firewire.h b/include/linux/firewire.h index 191501afd7fb..3b0e820375ab 100644 --- a/include/linux/firewire.h +++ b/include/linux/firewire.h @@ -251,8 +251,10 @@ struct ieee1394_device_id; struct fw_driver { struct device_driver driver; + int (*probe)(struct fw_unit *unit, const struct ieee1394_device_id *id); /* Called when the parent device sits through a bus reset. */ void (*update)(struct fw_unit *unit); + void (*remove)(struct fw_unit *unit); const struct ieee1394_device_id *id_table; }; |