diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-02-03 11:55:19 -0500 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-03-24 15:56:48 -0400 |
commit | e1eff7a393d4a4e3ad1cf65fcba899146840bfd2 (patch) | |
tree | 88a040babea1853f40072ed199a78b60f4dcb387 /drivers/firewire/fw-device.c | |
parent | d01b01787680a1156ff6a554e40baa460bb88efb (diff) |
firewire: normalize a variable name
Standardize on if (err)
handle_error;
and if (ret < 0)
handle_error;
Don't call a variable err if we store values in it which mean success.
Also, offset some return statements by a blank line since this how we do
it in drivers/firewire.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/fw-device.c')
-rw-r--r-- | drivers/firewire/fw-device.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c index df789d321d1b..633e44de5d1a 100644 --- a/drivers/firewire/fw-device.c +++ b/drivers/firewire/fw-device.c | |||
@@ -761,7 +761,7 @@ static void fw_device_init(struct work_struct *work) | |||
761 | struct fw_device *device = | 761 | struct fw_device *device = |
762 | container_of(work, struct fw_device, work.work); | 762 | container_of(work, struct fw_device, work.work); |
763 | struct device *revived_dev; | 763 | struct device *revived_dev; |
764 | int minor, err; | 764 | int minor, ret; |
765 | 765 | ||
766 | /* | 766 | /* |
767 | * All failure paths here set node->data to NULL, so that we | 767 | * All failure paths here set node->data to NULL, so that we |
@@ -797,12 +797,12 @@ static void fw_device_init(struct work_struct *work) | |||
797 | 797 | ||
798 | fw_device_get(device); | 798 | fw_device_get(device); |
799 | down_write(&fw_device_rwsem); | 799 | down_write(&fw_device_rwsem); |
800 | err = idr_pre_get(&fw_device_idr, GFP_KERNEL) ? | 800 | ret = idr_pre_get(&fw_device_idr, GFP_KERNEL) ? |
801 | idr_get_new(&fw_device_idr, device, &minor) : | 801 | idr_get_new(&fw_device_idr, device, &minor) : |
802 | -ENOMEM; | 802 | -ENOMEM; |
803 | up_write(&fw_device_rwsem); | 803 | up_write(&fw_device_rwsem); |
804 | 804 | ||
805 | if (err < 0) | 805 | if (ret < 0) |
806 | goto error; | 806 | goto error; |
807 | 807 | ||
808 | device->device.bus = &fw_bus_type; | 808 | device->device.bus = &fw_bus_type; |