Commit 33de9071 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: jr3_pci: tidy up comedi_load_firmware()



Refactor the function to remove some unnecessary indents and make
it a bit more concise.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a31e0f89
Loading
Loading
Loading
Loading
+15 −15
Original line number Diff line number Diff line
@@ -98,25 +98,25 @@ static int comedi_load_firmware(struct comedi_device *dev, const char *name,
					  const u8 *data, size_t size))
{
	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
	int result = 0;
	const struct firmware *fw;
	char *firmware_path;
	int ret;

	firmware_path = kasprintf(GFP_KERNEL, "comedi/%s", name);
	if (!firmware_path) {
		result = -ENOMEM;
	} else {
		result = request_firmware(&fw, firmware_path, &pcidev->dev);
		if (result == 0) {
	if (!cb)
				result = -EINVAL;
			else
				result = cb(dev, fw->data, fw->size);
		return -EINVAL;

	firmware_path = kasprintf(GFP_KERNEL, "comedi/%s", name);
	if (!firmware_path)
		return -ENOMEM;

	ret = request_firmware(&fw, firmware_path, &pcidev->dev);
	if (ret == 0) {
		ret = cb(dev, fw->data, fw->size);
		release_firmware(fw);
	}
	kfree(firmware_path);
	}
	return result;

	return ret;
}

static struct poll_delay_t poll_delay_min_max(int min, int max)