diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2011-08-27 11:31:07 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-29 11:01:03 -0700 |
| commit | c352ee8f610bb136d5666b142bff8f48fa7a9289 (patch) | |
| tree | 833ab0eb38bcdd54323c49c26b5c50d01fe9efd2 /drivers/staging/hv/storvsc.c | |
| parent | 582f445fde4886959deacf93b6dea6817f41ba88 (diff) | |
Staging: hv: storvsc: Get rid of release_stor_device() by inlining the code
Get rid of release_stor_device() by inlining the code.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/hv/storvsc.c')
| -rw-r--r-- | drivers/staging/hv/storvsc.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c index 0f8c60961ec1..1976a34102b8 100644 --- a/drivers/staging/hv/storvsc.c +++ b/drivers/staging/hv/storvsc.c @@ -67,21 +67,6 @@ static inline struct storvsc_device *get_in_stor_device( return stor_device; } -/* Drop ref count to 1 to effectively disable get_out_stor_device() */ -static inline struct storvsc_device *release_stor_device( - struct hv_device *device) -{ - struct storvsc_device *stor_device; - - stor_device = (struct storvsc_device *)device->ext; - - /* Busy wait until the ref drop to 2, then set it to 1 */ - while (atomic_cmpxchg(&stor_device->ref_count, 2, 1) != 2) - udelay(100); - - return stor_device; -} - /* Drop ref count to 0. No one can use stor_device object. */ static inline struct storvsc_device *final_release_stor_device( struct hv_device *device) @@ -401,8 +386,8 @@ int storvsc_dev_remove(struct hv_device *device) struct storvsc_device *stor_device; unsigned long flags; - - stor_device = release_stor_device(device); + stor_device = (struct storvsc_device *)device->ext; + atomic_dec(&stor_device->ref_count); spin_lock_irqsave(&device->channel->inbound_lock, flags); stor_device->destroy = true; |