diff options
author | Borislav Petkov <bbpetkov@yahoo.de> | 2008-02-02 13:56:33 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-02 13:56:33 -0500 |
commit | 9a24b63db06a4b9389367ebafd9b0cfb5dd1b39f (patch) | |
tree | 9ab16b06813718393c84e3bf8e43283f1a2c919b /drivers/ide/ide-floppy.c | |
parent | 0078df2ece5a752e878410e39eb31e075183b4e7 (diff) |
ide-floppy: disambiguate function names
There were two almost identical function names in ide-floppy.c, which makes
their distinction almost impossible. While ide_floppy_release() cleans up the
object after the last reference to it has been dropped, idefloppy_release() is
the blkdev .release method from struct block_device_operations which releases
that last reference.
Rename ide_floppy_release() to idefloppy_cleanup_obj() in order to make its
purpose more clear.
There should be no functionality change resulting from this patch.
Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r-- | drivers/ide/ide-floppy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 66dfd1811101..771bfaff93b3 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -438,12 +438,12 @@ static struct ide_floppy_obj *ide_floppy_get(struct gendisk *disk) | |||
438 | return floppy; | 438 | return floppy; |
439 | } | 439 | } |
440 | 440 | ||
441 | static void ide_floppy_release(struct kref *); | 441 | static void idefloppy_cleanup_obj(struct kref *); |
442 | 442 | ||
443 | static void ide_floppy_put(struct ide_floppy_obj *floppy) | 443 | static void ide_floppy_put(struct ide_floppy_obj *floppy) |
444 | { | 444 | { |
445 | mutex_lock(&idefloppy_ref_mutex); | 445 | mutex_lock(&idefloppy_ref_mutex); |
446 | kref_put(&floppy->kref, ide_floppy_release); | 446 | kref_put(&floppy->kref, idefloppy_cleanup_obj); |
447 | mutex_unlock(&idefloppy_ref_mutex); | 447 | mutex_unlock(&idefloppy_ref_mutex); |
448 | } | 448 | } |
449 | 449 | ||
@@ -1713,7 +1713,7 @@ static void ide_floppy_remove(ide_drive_t *drive) | |||
1713 | ide_floppy_put(floppy); | 1713 | ide_floppy_put(floppy); |
1714 | } | 1714 | } |
1715 | 1715 | ||
1716 | static void ide_floppy_release(struct kref *kref) | 1716 | static void idefloppy_cleanup_obj(struct kref *kref) |
1717 | { | 1717 | { |
1718 | struct ide_floppy_obj *floppy = to_ide_floppy(kref); | 1718 | struct ide_floppy_obj *floppy = to_ide_floppy(kref); |
1719 | ide_drive_t *drive = floppy->drive; | 1719 | ide_drive_t *drive = floppy->drive; |