leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: line6: Remove CHECK_RETURN macro

Browse Source 
Such a macro doesn't improve readability.

Tested-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-01-19 16:08:02 +01:00
parent 10e3a023c9
commit b2a3b02392
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/usb/line6/driver.h
View File

@ -48,13 +48,6 @@
#define LINE6_CHANNEL_MASK 0x0f
#define CHECK_RETURN(x) \
do { \
err = x; \
if (err < 0) \
return err; \
} while (0)
#define CHECK_STARTUP_PROGRESS(x, n) \
do { \
if ((x) >= (n)) \

12
sound/usb/line6/pod.c
View File

@ -429,9 +429,15 @@ static int pod_create_files2(struct device *dev)
{
int err;
CHECK_RETURN(device_create_file(dev, &dev_attr_device_id));
CHECK_RETURN(device_create_file(dev, &dev_attr_firmware_version));
CHECK_RETURN(device_create_file(dev, &dev_attr_serial_number));
err = device_create_file(dev, &dev_attr_device_id);
if (err < 0)
return err;
err = device_create_file(dev, &dev_attr_firmware_version);
if (err < 0)
return err;
err = device_create_file(dev, &dev_attr_serial_number);
if (err < 0)
return err;
return 0;
}

10
sound/usb/line6/toneport.c
View File

@ -431,10 +431,12 @@ static int toneport_init(struct usb_interface *interface,
line6_read_data(line6, 0x80c2, &toneport->firmware_version, 1);
if (toneport_has_led(toneport->type)) {
CHECK_RETURN(device_create_file
(&interface->dev, &dev_attr_led_red));
CHECK_RETURN(device_create_file
(&interface->dev, &dev_attr_led_green));
err = device_create_file(&interface->dev, &dev_attr_led_red);
if (err < 0)
return err;
err = device_create_file(&interface->dev, &dev_attr_led_green);
if (err < 0)
return err;
}
toneport_setup(toneport);