Skip to content

Commit

Permalink
Staging: hv: storvsc: Get rid of release_stor_device() by inlining th…
Browse files Browse the repository at this point in the history
…e 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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Aug 29, 2011
1 parent 582f445 commit c352ee8
Showing 1 changed file with 2 additions and 17 deletions.
19 changes: 2 additions & 17 deletions drivers/staging/hv/storvsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit c352ee8

Please sign in to comment.