Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

firewire: normalize a variable name

Browse source 
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>
This commit is contained in:
Stefan Richter 2009-02-03 17:55:19 +01:00
parent d01b017876
commit e1eff7a393
4 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/firewire/fw-card.c
View file

@ -404,7 +404,7 @@ int fw_card_add(struct fw_card *card,
{ {
u32 *config_rom; u32 *config_rom;
size_t length; size_t length;
int err; int ret;
card->max_receive = max_receive; card->max_receive = max_receive;
card->link_speed = link_speed; card->link_speed = link_speed;
@ -415,13 +415,14 @@ int fw_card_add(struct fw_card *card,
list_add_tail(&card->link, &card_list); list_add_tail(&card->link, &card_list);
mutex_unlock(&card_mutex); mutex_unlock(&card_mutex);
err = card->driver->enable(card, config_rom, length); ret = card->driver->enable(card, config_rom, length);
if (err < 0) { if (ret < 0) {
mutex_lock(&card_mutex); mutex_lock(&card_mutex);
list_del(&card->link); list_del(&card->link);
mutex_unlock(&card_mutex); mutex_unlock(&card_mutex);
} }
return err;
return ret;
} }
EXPORT_SYMBOL(fw_card_add); EXPORT_SYMBOL(fw_card_add);

6
drivers/firewire/fw-device.c
View file

@ -761,7 +761,7 @@ static void fw_device_init(struct work_struct *work)
struct fw_device *device = struct fw_device *device =
container_of(work, struct fw_device, work.work); container_of(work, struct fw_device, work.work);
struct device *revived_dev; struct device *revived_dev;
int minor, err; int minor, ret;
/* /*
* All failure paths here set node->data to NULL, so that we * 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)
fw_device_get(device); fw_device_get(device);
down_write(&fw_device_rwsem); down_write(&fw_device_rwsem);
err = idr_pre_get(&fw_device_idr, GFP_KERNEL) ? ret = idr_pre_get(&fw_device_idr, GFP_KERNEL) ?
idr_get_new(&fw_device_idr, device, &minor) : idr_get_new(&fw_device_idr, device, &minor) :
-ENOMEM; -ENOMEM;
up_write(&fw_device_rwsem); up_write(&fw_device_rwsem);
if (err < 0) if (ret < 0)
goto error; goto error;
device->device.bus = &fw_bus_type; device->device.bus = &fw_bus_type;

10
drivers/firewire/fw-iso.c
View file

@ -75,19 +75,21 @@ int fw_iso_buffer_init(struct fw_iso_buffer *buffer, struct fw_card *card,
kfree(buffer->pages); kfree(buffer->pages);
out: out:
buffer->pages = NULL; buffer->pages = NULL;
return -ENOMEM; return -ENOMEM;
} }
int fw_iso_buffer_map(struct fw_iso_buffer *buffer, struct vm_area_struct *vma) int fw_iso_buffer_map(struct fw_iso_buffer *buffer, struct vm_area_struct *vma)
{ {
unsigned long uaddr; unsigned long uaddr;
int i, ret; int i, err;
uaddr = vma->vm_start; uaddr = vma->vm_start;
for (i = 0; i < buffer->page_count; i++) { for (i = 0; i < buffer->page_count; i++) {
ret = vm_insert_page(vma, uaddr, buffer->pages[i]); err = vm_insert_page(vma, uaddr, buffer->pages[i]);
if (ret) if (err)
return ret; return err;
uaddr += PAGE_SIZE; uaddr += PAGE_SIZE;
} }

3
drivers/firewire/fw-ohci.c
View file

@ -2459,11 +2459,12 @@ static int __devinit pci_probe(struct pci_dev *dev,
reg_read(ohci, OHCI1394_GUIDLo); reg_read(ohci, OHCI1394_GUIDLo);
err = fw_card_add(&ohci->card, max_receive, link_speed, guid); err = fw_card_add(&ohci->card, max_receive, link_speed, guid);
if (err < 0) if (err)
goto fail_self_id; goto fail_self_id;
fw_notify("Added fw-ohci device %s, OHCI version %x.%x\n", fw_notify("Added fw-ohci device %s, OHCI version %x.%x\n",
dev_name(&dev->dev), version >> 16, version & 0xff); dev_name(&dev->dev), version >> 16, version & 0xff);
return 0; return 0;
fail_self_id: fail_self_id: