kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bluetooth: ath3k: Avoid duplication of code

Browse source 
In commit 86e09287e4, to reduce memory
usage, the functions of the ath3k module were rewritten to release the
firmware blob after it has been loaded (successfully or not).

The resuting code has some redundancy and the compiler can potentially
produce better code if we omit a function call that is unconditionally
executed in

,----
|     if (ath3k_load_firmware(udev, firmware)) {
|             release_firmware(firmware);
|             return -EIO;
|     }
|     release_firmware(firmware);
|
|     return 0;
| }
`----

It may also be argued that the rewritten code becomes easier to read,
and also to see the code coverage of the snippet in question.

Signed-off-by: Rogério Brito <rbrito@ime.usp.br>
Cc: Alexander Holler <holler@ahsoftware.de>
Cc: "Gustavo F. Padovan" <padovan@profusion.mobi>
Cc: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Rogério Brito 2011-02-03 01:42:05 -02:00 committed by Gustavo F. Padovan
parent d37f50e190
commit 84f0e17f78
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/bluetooth/ath3k.c
View file

@ -108,6 +108,7 @@ static int ath3k_probe(struct usb_interface *intf,
{ {
const struct firmware *firmware; const struct firmware *firmware;
struct usb_device *udev = interface_to_usbdev(intf); struct usb_device *udev = interface_to_usbdev(intf);
int ret;
BT_DBG("intf %p id %p", intf, id); BT_DBG("intf %p id %p", intf, id);
@ -118,13 +119,10 @@ static int ath3k_probe(struct usb_interface *intf,
return -EIO; return -EIO;
} }
if (ath3k_load_firmware(udev, firmware)) { ret = ath3k_load_firmware(udev, firmware);
release_firmware(firmware);
return -EIO;
}
release_firmware(firmware); release_firmware(firmware);
return 0; return ret;
} }
static void ath3k_disconnect(struct usb_interface *intf) static void ath3k_disconnect(struct usb_interface *intf)