usb: gadget: f_uac2: use defined constants as defaults

When configfs is integrated the same values will have to be used
as defaults. Use symbolic names in order not to duplicate magic numbers.

Tested-by: Sebastian Reimers <sebastian.reimers@googlemail.com>
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>

diff --git a/drivers/usb/gadget/function/u_uac2.h b/drivers/usb/gadget/function/u_uac2.h
index 290b83af1b6995054b3bb4e10441d5c5d9a34519..ed7f7361a53e40fe40ecc31af3ed3390954561a7 100644 (file)
--- a/drivers/usb/gadget/function/u_uac2.h
+++ b/drivers/usb/gadget/function/u_uac2.h
@@ -18,6 +18,13 @@
 
 #include <linux/usb/composite.h>
 
+#define UAC2_DEF_PCHMASK 0x3
+#define UAC2_DEF_PSRATE 48000
+#define UAC2_DEF_PSSIZE 2
+#define UAC2_DEF_CCHMASK 0x3
+#define UAC2_DEF_CSRATE 64000
+#define UAC2_DEF_CSSIZE 2
+
 struct f_uac2_opts {
        struct usb_function_instance    func_inst;
        int                             p_chmask;

diff --git a/drivers/usb/gadget/legacy/audio.c b/drivers/usb/gadget/legacy/audio.c
index 159af03459868b0b627bca71587cce5cf7c8be96..c28691fbb5762ad1adea71eb665c0eccffc11594 100644 (file)
--- a/drivers/usb/gadget/legacy/audio.c
+++ b/drivers/usb/gadget/legacy/audio.c
@@ -22,33 +22,35 @@
 USB_GADGET_COMPOSITE_OPTIONS();
 
 #ifndef CONFIG_GADGET_UAC1
+#include "u_uac2.h"
+
 /* Playback(USB-IN) Default Stereo - Fl/Fr */
-static int p_chmask = 0x3;
+static int p_chmask = UAC2_DEF_PCHMASK;
 module_param(p_chmask, uint, S_IRUGO);
 MODULE_PARM_DESC(p_chmask, "Playback Channel Mask");
 
 /* Playback Default 48 KHz */
-static int p_srate = 48000;
+static int p_srate = UAC2_DEF_PSRATE;
 module_param(p_srate, uint, S_IRUGO);
 MODULE_PARM_DESC(p_srate, "Playback Sampling Rate");
 
 /* Playback Default 16bits/sample */
-static int p_ssize = 2;
+static int p_ssize = UAC2_DEF_PSSIZE;
 module_param(p_ssize, uint, S_IRUGO);
 MODULE_PARM_DESC(p_ssize, "Playback Sample Size(bytes)");
 
 /* Capture(USB-OUT) Default Stereo - Fl/Fr */
-static int c_chmask = 0x3;
+static int c_chmask = UAC2_DEF_CCHMASK;
 module_param(c_chmask, uint, S_IRUGO);
 MODULE_PARM_DESC(c_chmask, "Capture Channel Mask");
 
 /* Capture Default 64 KHz */
-static int c_srate = 64000;
+static int c_srate = UAC2_DEF_CSRATE;
 module_param(c_srate, uint, S_IRUGO);
 MODULE_PARM_DESC(c_srate, "Capture Sampling Rate");
 
 /* Capture Default 16bits/sample */
-static int c_ssize = 2;
+static int c_ssize = UAC2_DEF_CSSIZE;
 module_param(c_ssize, uint, S_IRUGO);
 MODULE_PARM_DESC(c_ssize, "Capture Sample Size(bytes)");
 #endif
@@ -81,8 +83,6 @@ static struct usb_function *f_uac2;
 #include "u_uac1.h"
 #include "u_uac1.c"
 #include "f_uac1.c"
-#else
-#include "u_uac2.h"
 #endif
 
 /*-------------------------------------------------------------------------*/