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>
This commit is contained in:
K. Y. Srinivasan
2011-08-27 11:31:07 -07:00
committed by Greg Kroah-Hartman
parent 582f445fde
commit c352ee8f61

View File

@@ -67,21 +67,6 @@ static inline struct storvsc_device *get_in_stor_device(
return 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. */ /* Drop ref count to 0. No one can use stor_device object. */
static inline struct storvsc_device *final_release_stor_device( static inline struct storvsc_device *final_release_stor_device(
struct hv_device *device) struct hv_device *device)
@@ -401,8 +386,8 @@ int storvsc_dev_remove(struct hv_device *device)
struct storvsc_device *stor_device; struct storvsc_device *stor_device;
unsigned long flags; unsigned long flags;
stor_device = (struct storvsc_device *)device->ext;
stor_device = release_stor_device(device); atomic_dec(&stor_device->ref_count);
spin_lock_irqsave(&device->channel->inbound_lock, flags); spin_lock_irqsave(&device->channel->inbound_lock, flags);
stor_device->destroy = true; stor_device->destroy = true;