diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-07 23:49:12 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-07 23:49:12 (GMT) |
commit | 8fe900b8c7aa6a307e552ff776e0c04c28dcf9c8 (patch) | |
tree | e4fd8e69ad6aa655562294fbe0606b770e89f824 /drivers/staging/hv/StorVscApi.h | |
parent | 138860b95359feee49a31fb12be87825e4cd84ac (diff) | |
parent | a71b676fa9b92119c0fb4e3fab34e45a17f15107 (diff) | |
download | linux-fsl-qoriq-8fe900b8c7aa6a307e552ff776e0c04c28dcf9c8.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (368 commits)
Staging: winbond: fix up wireless api errors
Staging: dream: camera: sk5k3e2fx: fix code style issues
Staging: dream: camera: msm_camera: fix code style issues
Staging: wlan-ng: More checkpatch.pl error cleanups
Staging: wlan-ng - checkpatch.pl fixups
Staging: comedi: comedi_fops.c: Checkpatch cleanup
Staging: comedi: fix suspect code indent in ni_labpc.c
Staging: comedi: fix yet another brace coding style issue in ni_labpc.c
Staging: comedi: fix another brace coding style issues in ni_labpc.c
Staging: comedi: fix brace coding style issue in ni_labpc.c
Staging: comedi: poc: Adding some KERN_ facility level
Staging: dream: camera: msm_camera: fix some code style issues
Staging: wlan-ng: fix most of the style issues in hfa384x.h
Staging: dream: camera: msm_camera: fix coding style issues
Staging: comedi: fix bracing coding style and 80 character issues in ni_660x.c
Staging: comedi: fix bracing coding style issue in ni_65xx.c
Staging: comedi: pcmad: Checkpatch cleanups
Staging: comedi: poc: fix coding style issues
staging: dt3155: revert u_long to u64 usage
Staging: comedi: drivers.c: Checkpatch cleanup
...
Diffstat (limited to 'drivers/staging/hv/StorVscApi.h')
-rw-r--r-- | drivers/staging/hv/StorVscApi.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/hv/StorVscApi.h b/drivers/staging/hv/StorVscApi.h index 69c1406..126a858 100644 --- a/drivers/staging/hv/StorVscApi.h +++ b/drivers/staging/hv/StorVscApi.h @@ -91,13 +91,9 @@ struct storvsc_driver_object { /* Maximum # of requests in flight per channel/device */ u32 MaxOutstandingRequestsPerChannel; - /* Set by the caller to allow us to re-enumerate the bus on the host */ - void (*OnHostRescan)(struct hv_device *Device); - /* Specific to this driver */ int (*OnIORequest)(struct hv_device *Device, struct hv_storvsc_request *Request); - int (*OnHostReset)(struct hv_device *Device); }; struct storvsc_device_info { @@ -108,6 +104,7 @@ struct storvsc_device_info { /* Interface */ int StorVscInitialize(struct hv_driver *driver); +int StorVscOnHostReset(struct hv_device *Device); int BlkVscInitialize(struct hv_driver *driver); #endif /* _STORVSC_API_H_ */ |