summaryrefslogtreecommitdiffstats
path: root/drivers/staging/line6/driver.c
diff options
context:
space:
mode:
authorChris Rorvick <chris@rorvick.com>2015-01-12 12:42:45 -0800
committerTakashi Iwai <tiwai@suse.de>2015-01-12 22:24:02 +0100
commit4cb1a4ae4afb36234bb0521b282d4861e12ff80b (patch)
tree67f1056fa80afc25fbc3fdd6fa8383e5b97e1693 /drivers/staging/line6/driver.c
parent5a8584742586373cd749335b4f7bcb983f39d34e (diff)
downloadop-kernel-dev-4cb1a4ae4afb36234bb0521b282d4861e12ff80b.zip
op-kernel-dev-4cb1a4ae4afb36234bb0521b282d4861e12ff80b.tar.gz
staging: line6: Rename capability macros
Including "BIT" in the macro name is pointless. Replace with "CAP" to provide some context for what its value represents. Signed-off-by: Chris Rorvick <chris@rorvick.com> Reviewed-by: Stefan Hajnoczi <stefanha@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/staging/line6/driver.c')
-rw-r--r--drivers/staging/line6/driver.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index acde205..4ec87a3 100644
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -59,7 +59,7 @@ MODULE_DEVICE_TABLE(usb, line6_id_table);
#define L6PROP(dev_id, dev_name, dev_cap)\
{.id = dev_id,\
- .name = dev_name, .capabilities = LINE6_BIT_##dev_cap}
+ .name = dev_name, .capabilities = LINE6_CAP_##dev_cap}
static const struct line6_properties line6_properties_table[] = {
L6PROP("BassPODxt", "BassPODxt", CTRL_PCM_HW),
@@ -830,7 +830,7 @@ static int line6_probe(struct usb_interface *interface,
usb_set_intfdata(interface, line6);
- if (properties->capabilities & LINE6_BIT_CONTROL) {
+ if (properties->capabilities & LINE6_CAP_CONTROL) {
/* initialize USB buffers: */
line6->buffer_listen =
kmalloc(LINE6_BUFSIZE_LISTEN, GFP_KERNEL);
@@ -1052,7 +1052,7 @@ static int line6_suspend(struct usb_interface *interface, pm_message_t message)
snd_power_change_state(line6->card, SNDRV_CTL_POWER_D3hot);
- if (line6->properties->capabilities & LINE6_BIT_CONTROL)
+ if (line6->properties->capabilities & LINE6_CAP_CONTROL)
line6_stop_listen(line6);
if (line6pcm != NULL) {
@@ -1071,7 +1071,7 @@ static int line6_resume(struct usb_interface *interface)
{
struct usb_line6 *line6 = usb_get_intfdata(interface);
- if (line6->properties->capabilities & LINE6_BIT_CONTROL)
+ if (line6->properties->capabilities & LINE6_CAP_CONTROL)
line6_start_listen(line6);
snd_power_change_state(line6->card, SNDRV_CTL_POWER_D0);
OpenPOWER on IntegriCloud