From: Atul <leoatul12@gmail.com>
To: perex@perex.cz
Cc: gregkh@linuxfoundation.org, alsa-devel@alsa-project.org,
Atul Gopinathan <leoatul12@gmail.com>,
tiwai@suse.com, linux-kernel@vger.kernel.org
Subject: [PATCH] ALSA: usb-audio: Fix coding style problems
Date: Sun, 8 Nov 2020 14:05:16 +0530 [thread overview]
Message-ID: <20201108083515.5256-1-leoatul12@gmail.com> (raw)
From: Atul Gopinathan <leoatul12@gmail.com>
Hi,
This patch fixes some coding style warnings and errors that were
generated using scripts/checkpatch.pl.
Signed-off-by: Atul Gopinathan <leoatul12@gmail.com>
---
sound/usb/pcm.c | 16 ++++++++--------
sound/usb/quirks.c | 21 +++++++++++----------
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index a860303cc522..ed5c77ce8e14 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -104,7 +104,7 @@ static struct audioformat *find_format(struct snd_usb_substream *subs)
continue;
}
attr = fp->ep_attr & USB_ENDPOINT_SYNCTYPE;
- if (! found) {
+ if (!found) {
found = fp;
cur_attr = attr;
continue;
@@ -304,7 +304,7 @@ static int search_roland_implicit_fb(struct usb_device *dev, int ifnum,
if (altsd->bAlternateSetting != altsetting ||
altsd->bInterfaceClass != USB_CLASS_VENDOR_SPEC ||
(altsd->bInterfaceSubClass != 2 &&
- altsd->bInterfaceProtocol != 2 ) ||
+ altsd->bInterfaceProtocol != 2) ||
altsd->bNumEndpoints < 1)
return -ENOENT;
epd = get_endpoint(*alts, 0);
@@ -482,8 +482,9 @@ static int set_sync_endpoint(struct snd_usb_substream *subs,
/* check sync-pipe endpoint */
/* ... and check descriptor size before accessing bSynchAddress
- because there is a version of the SB Audigy 2 NX firmware lacking
- the audio fields in the endpoint descriptors */
+ * because there is a version of the SB Audigy 2 NX firmware lacking
+ * the audio fields in the endpoint descriptors
+ */
if ((get_endpoint(alts, 1)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_ISOC ||
(get_endpoint(alts, 1)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE &&
get_endpoint(alts, 1)->bSynchAddress != 0)) {
@@ -911,7 +912,7 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream)
struct usb_interface *iface;
int ret;
- if (! subs->cur_audiofmt) {
+ if (!subs->cur_audiofmt) {
dev_err(&subs->dev->dev, "no format is specified!\n");
return -ENXIO;
}
@@ -973,9 +974,8 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream)
return ret;
}
-static const struct snd_pcm_hardware snd_usb_hardware =
-{
- .info = SNDRV_PCM_INFO_MMAP |
+static const struct snd_pcm_hardware snd_usb_hardware = {
+ .info = SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_BATCH |
SNDRV_PCM_INFO_INTERLEAVED |
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index c989ad8052ae..b6f3345db93f 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -398,7 +398,7 @@ static int create_autodetect_quirks(struct snd_usb_audio *chip,
}
/*
- * Create a stream for an Edirol UA-700/UA-25/UA-4FX interface.
+ * Create a stream for an Edirol UA-700/UA-25/UA-4FX interface.
* The only way to detect the sample rate is by looking at wMaxPacketSize.
*/
static int create_uaxx_quirk(struct snd_usb_audio *chip,
@@ -593,7 +593,7 @@ static int snd_usb_extigy_boot_quirk(struct usb_device *dev, struct usb_interfac
le16_to_cpu(get_cfg_desc(config)->wTotalLength) == EXTIGY_FIRMWARE_SIZE_NEW) {
dev_dbg(&dev->dev, "sending Extigy boot sequence...\n");
/* Send message to force it to reconnect with full interface. */
- err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev,0),
+ err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0),
0x10, 0x43, 0x0001, 0x000a, NULL, 0);
if (err < 0)
dev_dbg(&dev->dev, "error sending boot message: %d\n", err);
@@ -646,8 +646,9 @@ static int snd_usb_fasttrackpro_boot_quirk(struct usb_device *dev)
"error usb_driver_set_configuration: %d\n",
err);
/* Always return an error, so that we stop creating a device
- that will just be destroyed and recreated with a new
- configuration */
+ * that will just be destroyed and recreated with a new
+ * configuration
+ */
return -ENODEV;
} else
dev_info(&dev->dev, "Fast Track Pro config OK\n");
@@ -895,9 +896,10 @@ static int snd_usb_nativeinstruments_boot_quirk(struct usb_device *dev)
usb_reset_device(dev);
/* return -EAGAIN, so the creation of an audio interface for this
- * temporary device is aborted. The device will reconnect with a
- * new product ID */
- return -EAGAIN;
+ * temporary device is aborted. The device will reconnect with a
+ * new product ID
+ */
+ return -EAGAIN;
}
static void mbox2_setup_48_24_magic(struct usb_device *dev)
@@ -919,7 +921,6 @@ static void mbox2_setup_48_24_magic(struct usb_device *dev)
0x81, 0xa2, 0x0100, 0x0086, &srate, 0x0003);
snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0),
0x81, 0xa2, 0x0100, 0x0003, &srate, 0x0003);
- return;
}
/* Digidesign Mbox 2 needs to load firmware onboard
@@ -1830,8 +1831,8 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip,
/* doesn't set the sample rate attribute, but supports it */
fp->attributes |= UAC_EP_CS_ATTR_SAMPLE_RATE;
break;
- case USB_ID(0x0763, 0x2001): /* M-Audio Quattro USB */
- case USB_ID(0x0763, 0x2012): /* M-Audio Fast Track Pro USB */
+ case USB_ID(0x0763, 0x2001): /* M-Audio Quattro USB */
+ case USB_ID(0x0763, 0x2012): /* M-Audio Fast Track Pro USB */
case USB_ID(0x047f, 0x0ca1): /* plantronics headset */
case USB_ID(0x077d, 0x07af): /* Griffin iMic (note that there is
an older model 77d:223) */
--
2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Atul <leoatul12@gmail.com>
To: perex@perex.cz
Cc: tiwai@suse.com, alsa-devel@alsa-project.org,
gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
Atul Gopinathan <leoatul12@gmail.com>
Subject: [PATCH] ALSA: usb-audio: Fix coding style problems
Date: Sun, 8 Nov 2020 14:05:16 +0530 [thread overview]
Message-ID: <20201108083515.5256-1-leoatul12@gmail.com> (raw)
From: Atul Gopinathan <leoatul12@gmail.com>
Hi,
This patch fixes some coding style warnings and errors that were
generated using scripts/checkpatch.pl.
Signed-off-by: Atul Gopinathan <leoatul12@gmail.com>
---
sound/usb/pcm.c | 16 ++++++++--------
sound/usb/quirks.c | 21 +++++++++++----------
2 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index a860303cc522..ed5c77ce8e14 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -104,7 +104,7 @@ static struct audioformat *find_format(struct snd_usb_substream *subs)
continue;
}
attr = fp->ep_attr & USB_ENDPOINT_SYNCTYPE;
- if (! found) {
+ if (!found) {
found = fp;
cur_attr = attr;
continue;
@@ -304,7 +304,7 @@ static int search_roland_implicit_fb(struct usb_device *dev, int ifnum,
if (altsd->bAlternateSetting != altsetting ||
altsd->bInterfaceClass != USB_CLASS_VENDOR_SPEC ||
(altsd->bInterfaceSubClass != 2 &&
- altsd->bInterfaceProtocol != 2 ) ||
+ altsd->bInterfaceProtocol != 2) ||
altsd->bNumEndpoints < 1)
return -ENOENT;
epd = get_endpoint(*alts, 0);
@@ -482,8 +482,9 @@ static int set_sync_endpoint(struct snd_usb_substream *subs,
/* check sync-pipe endpoint */
/* ... and check descriptor size before accessing bSynchAddress
- because there is a version of the SB Audigy 2 NX firmware lacking
- the audio fields in the endpoint descriptors */
+ * because there is a version of the SB Audigy 2 NX firmware lacking
+ * the audio fields in the endpoint descriptors
+ */
if ((get_endpoint(alts, 1)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_ISOC ||
(get_endpoint(alts, 1)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE &&
get_endpoint(alts, 1)->bSynchAddress != 0)) {
@@ -911,7 +912,7 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream)
struct usb_interface *iface;
int ret;
- if (! subs->cur_audiofmt) {
+ if (!subs->cur_audiofmt) {
dev_err(&subs->dev->dev, "no format is specified!\n");
return -ENXIO;
}
@@ -973,9 +974,8 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream)
return ret;
}
-static const struct snd_pcm_hardware snd_usb_hardware =
-{
- .info = SNDRV_PCM_INFO_MMAP |
+static const struct snd_pcm_hardware snd_usb_hardware = {
+ .info = SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_BATCH |
SNDRV_PCM_INFO_INTERLEAVED |
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index c989ad8052ae..b6f3345db93f 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -398,7 +398,7 @@ static int create_autodetect_quirks(struct snd_usb_audio *chip,
}
/*
- * Create a stream for an Edirol UA-700/UA-25/UA-4FX interface.
+ * Create a stream for an Edirol UA-700/UA-25/UA-4FX interface.
* The only way to detect the sample rate is by looking at wMaxPacketSize.
*/
static int create_uaxx_quirk(struct snd_usb_audio *chip,
@@ -593,7 +593,7 @@ static int snd_usb_extigy_boot_quirk(struct usb_device *dev, struct usb_interfac
le16_to_cpu(get_cfg_desc(config)->wTotalLength) == EXTIGY_FIRMWARE_SIZE_NEW) {
dev_dbg(&dev->dev, "sending Extigy boot sequence...\n");
/* Send message to force it to reconnect with full interface. */
- err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev,0),
+ err = snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0),
0x10, 0x43, 0x0001, 0x000a, NULL, 0);
if (err < 0)
dev_dbg(&dev->dev, "error sending boot message: %d\n", err);
@@ -646,8 +646,9 @@ static int snd_usb_fasttrackpro_boot_quirk(struct usb_device *dev)
"error usb_driver_set_configuration: %d\n",
err);
/* Always return an error, so that we stop creating a device
- that will just be destroyed and recreated with a new
- configuration */
+ * that will just be destroyed and recreated with a new
+ * configuration
+ */
return -ENODEV;
} else
dev_info(&dev->dev, "Fast Track Pro config OK\n");
@@ -895,9 +896,10 @@ static int snd_usb_nativeinstruments_boot_quirk(struct usb_device *dev)
usb_reset_device(dev);
/* return -EAGAIN, so the creation of an audio interface for this
- * temporary device is aborted. The device will reconnect with a
- * new product ID */
- return -EAGAIN;
+ * temporary device is aborted. The device will reconnect with a
+ * new product ID
+ */
+ return -EAGAIN;
}
static void mbox2_setup_48_24_magic(struct usb_device *dev)
@@ -919,7 +921,6 @@ static void mbox2_setup_48_24_magic(struct usb_device *dev)
0x81, 0xa2, 0x0100, 0x0086, &srate, 0x0003);
snd_usb_ctl_msg(dev, usb_sndctrlpipe(dev, 0),
0x81, 0xa2, 0x0100, 0x0003, &srate, 0x0003);
- return;
}
/* Digidesign Mbox 2 needs to load firmware onboard
@@ -1830,8 +1831,8 @@ void snd_usb_audioformat_attributes_quirk(struct snd_usb_audio *chip,
/* doesn't set the sample rate attribute, but supports it */
fp->attributes |= UAC_EP_CS_ATTR_SAMPLE_RATE;
break;
- case USB_ID(0x0763, 0x2001): /* M-Audio Quattro USB */
- case USB_ID(0x0763, 0x2012): /* M-Audio Fast Track Pro USB */
+ case USB_ID(0x0763, 0x2001): /* M-Audio Quattro USB */
+ case USB_ID(0x0763, 0x2012): /* M-Audio Fast Track Pro USB */
case USB_ID(0x047f, 0x0ca1): /* plantronics headset */
case USB_ID(0x077d, 0x07af): /* Griffin iMic (note that there is
an older model 77d:223) */
--
2.25.1
next reply other threads:[~2020-11-10 10:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-08 8:35 Atul [this message]
2020-11-08 8:35 ` [PATCH] ALSA: usb-audio: Fix coding style problems Atul
2020-11-08 9:11 ` Greg KH
2020-11-08 9:11 ` Greg KH
2020-11-08 11:19 ` Atul Gopinathan
2020-11-08 11:19 ` Atul Gopinathan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201108083515.5256-1-leoatul12@gmail.com \
--to=leoatul12@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.