Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1eff7a3 authored by Stefan Richter's avatar Stefan Richter
Browse files

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: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent d01b0178

drivers/firewire/fw-card.c

+5 −4
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ int fw_card_add(struct fw_card *card, 
{

	u32 *config_rom;

	size_t length;

	int err;

	int ret;



	card->max_receive = max_receive;

	card->link_speed = link_speed;
@@ -415,13 +415,14 @@ int fw_card_add(struct fw_card *card, 
	list_add_tail(&card->link, &card_list);

	mutex_unlock(&card_mutex);



	err = card->driver->enable(card, config_rom, length);

	if (err < 0) {

	ret = card->driver->enable(card, config_rom, length);

	if (ret < 0) {

		mutex_lock(&card_mutex);

		list_del(&card->link);

		mutex_unlock(&card_mutex);

	}

	return err;



	return ret;

}

EXPORT_SYMBOL(fw_card_add);

drivers/firewire/fw-device.c

+3 −3
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ static void fw_device_init(struct work_struct *work) 
	struct fw_device *device =

		container_of(work, struct fw_device, work.work);

	struct device *revived_dev;

	int minor, err;

	int minor, ret;



	/*

	 * 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);

	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) :

	      -ENOMEM;

	up_write(&fw_device_rwsem);



	if (err < 0)

	if (ret < 0)

		goto error;



	device->device.bus = &fw_bus_type;

drivers/firewire/fw-iso.c

+6 −4
Original line number Diff line number Diff line
@@ -75,19 +75,21 @@ int fw_iso_buffer_init(struct fw_iso_buffer *buffer, struct fw_card *card, 
	kfree(buffer->pages);

 out:

	buffer->pages = NULL;



	return -ENOMEM;

}



int fw_iso_buffer_map(struct fw_iso_buffer *buffer, struct vm_area_struct *vma)

{

	unsigned long uaddr;

	int i, ret;

	int i, err;



	uaddr = vma->vm_start;

	for (i = 0; i < buffer->page_count; i++) {

		ret = vm_insert_page(vma, uaddr, buffer->pages[i]);

		if (ret)

			return ret;

		err = vm_insert_page(vma, uaddr, buffer->pages[i]);

		if (err)

			return err;



		uaddr += PAGE_SIZE;

	}

drivers/firewire/fw-ohci.c

+2 −1
Original line number Diff line number Diff line
@@ -2459,11 +2459,12 @@ static int __devinit pci_probe(struct pci_dev *dev, 
		reg_read(ohci, OHCI1394_GUIDLo);



	err = fw_card_add(&ohci->card, max_receive, link_speed, guid);

	if (err < 0)

	if (err)

		goto fail_self_id;



	fw_notify("Added fw-ohci device %s, OHCI version %x.%x\n",

		  dev_name(&dev->dev), version >> 16, version & 0xff);



	return 0;



 fail_self_id: