Skip to contentSkip to conversation

constify ALSA usb_device_id.

PATCH Applied Arvind Yadav 2 participants 9 messages Aug 6, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover constify ALSA usb_device_id.

usb_device_id are not supposed to change at runtime. All functions working with usb_device_id provided by <linux/usb.h> work with const usb_device_id. So mark the non-const structs as const.

Arvind Yadav (7):
[PATCH 1/7] ALSA: 6fire: constify usb_device_id. [PATCH 2/7] ALSA: bcd2000: constify usb_device_id. [PATCH 3/7] ALSA: snd-usb-caiaq: constify usb_device_id. [PATCH 4/7] ALSA: usb-audio: constify usb_device_id. [PATCH 5/7] ALSA: ua101: constify usb_device_id. [PATCH 6/7] ALSA: us122l: constify usb_device_id. [PATCH 7/7] ALSA: usbusx2y: constify usb_device_id.

 sound/usb/6fire/chip.c      | 2 +-
 sound/usb/bcd2000/bcd2000.c | 2 +-
 sound/usb/caiaq/device.c    | 2 +-
 sound/usb/card.c            | 4 ++--
 sound/usb/misc/ua101.c      | 2 +-
 sound/usb/usx2y/us122l.c    | 2 +-
 sound/usb/usx2y/usbusx2y.c  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/7 ALSA: 6fire: constify usb_device_id.

usb_device_id are not supposed to change at runtime. All functions working with usb_device_id provided by <linux/usb.h> work with const usb_device_id. So mark the non-const structs as const.

---
 sound/usb/6fire/chip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/6fire/chip.c +1 -1
index dcddfc3..bc2a24f 100644
@@ -198,7 +198,7 @@ static void usb6fire_chip_disconnect(struct usb_interface *intf)
 	}
 }
 
-static struct usb_device_id device_table[] = {
+static const struct usb_device_id device_table[] = {
 	{
 		.match_flags = USB_DEVICE_ID_MATCH_DEVICE,
 		.idVendor = 0x0ccd,
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/7 ALSA: bcd2000: constify usb_device_id.

In reply to Arvind Yadav

usb_device_id are not supposed to change at runtime. All functions working with usb_device_id provided by <linux/usb.h> work with const usb_device_id. So mark the non-const structs as const.

---
 sound/usb/bcd2000/bcd2000.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/bcd2000/bcd2000.c +1 -1
index 2ff9d57..7371e5b 100644
@@ -29,7 +29,7 @@
 #define PREFIX "snd-bcd2000: "
 #define BUFSIZE 64
 
-static struct usb_device_id id_table[] = {
+static const struct usb_device_id id_table[] = {
 	{ USB_DEVICE(0x1397, 0x00bd) },
 	{ },
 };
Signature · 1 line
2.7.4
#3 lore raw

PATCH 3/7 ALSA: snd-usb-caiaq: constify usb_device_id.

In reply to Arvind Yadav

usb_device_id are not supposed to change at runtime. All functions working with usb_device_id provided by <linux/usb.h> work with const usb_device_id. So mark the non-const structs as const.

---
 sound/usb/caiaq/device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/caiaq/device.c +1 -1
index b871ba4..0fb6b1b7 100644
@@ -81,7 +81,7 @@ enum {
 	DEPTH_32	= 3
 };
 
-static struct usb_device_id snd_usb_id_table[] = {
+static const struct usb_device_id snd_usb_id_table[] = {
 	{
 		.match_flags =	USB_DEVICE_ID_MATCH_DEVICE,
 		.idVendor =	USB_VID_NATIVEINSTRUMENTS,
Signature · 1 line
2.7.4
#4 lore raw

PATCH 4/7 ALSA: usb-audio: constify usb_device_id.

In reply to Arvind Yadav

usb_device_id are not supposed to change at runtime. All functions working with usb_device_id provided by <linux/usb.h> work with const usb_device_id. So mark the non-const structs as const.

---
 sound/usb/card.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/usb/card.c +2 -2
index 6640277..3dc36d9 100644
@@ -486,7 +486,7 @@ static bool get_alias_id(struct usb_device *dev, unsigned int *id)
 	return false;
 }
 
-static struct usb_device_id usb_audio_ids[]; /* defined below */
+static const struct usb_device_id usb_audio_ids[]; /* defined below */
 
 /* look for the corresponding quirk */
 static const struct snd_usb_audio_quirk *
@@ -814,7 +814,7 @@ static int usb_audio_reset_resume(struct usb_interface *intf)
 #define usb_audio_reset_resume	NULL
 #endif		/* CONFIG_PM */
 
-static struct usb_device_id usb_audio_ids [] = {
+static const struct usb_device_id usb_audio_ids [] = {
 #include "quirks-table.h"
     { .match_flags = (USB_DEVICE_ID_MATCH_INT_CLASS | USB_DEVICE_ID_MATCH_INT_SUBCLASS),
       .bInterfaceClass = USB_CLASS_AUDIO,
Signature · 1 line
2.7.4
#5 lore raw

PATCH 5/7 ALSA: ua101: constify usb_device_id.

In reply to Arvind Yadav

usb_device_id are not supposed to change at runtime. All functions working with usb_device_id provided by <linux/usb.h> work with const usb_device_id. So mark the non-const structs as const.

---
 sound/usb/misc/ua101.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/misc/ua101.c +1 -1
index c19a5dd..b05cd38 100644
@@ -1366,7 +1366,7 @@ static void ua101_disconnect(struct usb_interface *interface)
 	mutex_unlock(&devices_mutex);
 }
 
-static struct usb_device_id ua101_ids[] = {
+static const struct usb_device_id ua101_ids[] = {
 	{ USB_DEVICE(0x0582, 0x0044) }, /* UA-1000 high speed */
 	{ USB_DEVICE(0x0582, 0x007d) }, /* UA-101 high speed */
 	{ USB_DEVICE(0x0582, 0x008d) }, /* UA-101 full speed */
Signature · 1 line
2.7.4
#6 lore raw

PATCH 6/7 ALSA: us122l: constify usb_device_id.

In reply to Arvind Yadav

usb_device_id are not supposed to change at runtime. All functions working with usb_device_id provided by <linux/usb.h> work with const usb_device_id. So mark the non-const structs as const.

---
 sound/usb/usx2y/us122l.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/usx2y/us122l.c +1 -1
index a33e31b2..b49d6e9 100644
@@ -736,7 +736,7 @@ static int snd_us122l_resume(struct usb_interface *intf)
 	return err;
 }
 
-static struct usb_device_id snd_us122l_usb_id_table[] = {
+static const struct usb_device_id snd_us122l_usb_id_table[] = {
 	{
 		.match_flags =	USB_DEVICE_ID_MATCH_DEVICE,
 		.idVendor =	0x0644,
Signature · 1 line
2.7.4
#7 lore raw

PATCH 7/7 ALSA: usbusx2y: constify usb_device_id.

In reply to Arvind Yadav

usb_device_id are not supposed to change at runtime. All functions working with usb_device_id provided by <linux/usb.h> work with const usb_device_id. So mark the non-const structs as const.

---
 sound/usb/usx2y/usbusx2y.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/usb/usx2y/usbusx2y.c +1 -1
index 91e0e2a..4569c0e 100644
@@ -313,7 +313,7 @@ static void usX2Y_unlinkSeq(struct snd_usX2Y_AsyncSeq *S)
 }
 
 
-static struct usb_device_id snd_usX2Y_usb_id_table[] = {
+static const struct usb_device_id snd_usX2Y_usb_id_table[] = {
 	{
 		.match_flags =	USB_DEVICE_ID_MATCH_DEVICE,
 		.idVendor =	0x1604,
Signature · 1 line
2.7.4
Applied
#8 lore raw
In reply to Arvind Yadav
Quoted 5 lines · Arvind Yadav

usb_device_id are not supposed to change at runtime. All functions working with usb_device_id provided by <linux/usb.h> work with const usb_device_id. So mark the non-const structs as const.

Quoted 8 lines

Arvind Yadav (7):
[PATCH 1/7] ALSA: 6fire: constify usb_device_id. [PATCH 2/7] ALSA: bcd2000: constify usb_device_id. [PATCH 3/7] ALSA: snd-usb-caiaq: constify usb_device_id. [PATCH 4/7] ALSA: usb-audio: constify usb_device_id. [PATCH 5/7] ALSA: ua101: constify usb_device_id. [PATCH 6/7] ALSA: us122l: constify usb_device_id. [PATCH 7/7] ALSA: usbusx2y: constify usb_device_id.

Applied all seven patches now. Thanks.

Takashi