forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390 
 kernel/sound/usb/line6/pod.c
....@@ -1,12 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23  * Line 6 Linux USB driver
34  *
45  * Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at)
5
- *
6
- *	This program is free software; you can redistribute it and/or
7
- *	modify it under the terms of the GNU General Public License as
8
- *	published by the Free Software Foundation, version 2.
9
- *
106  */
117 
128 #include <linux/slab.h>
....@@ -39,11 +35,9 @@
3935 	Stages of POD startup procedure
4036 */
4137 enum {
42
-	POD_STARTUP_INIT = 1,
4338 	POD_STARTUP_VERSIONREQ,
44
-	POD_STARTUP_WORKQUEUE,
4539 	POD_STARTUP_SETUP,
46
-	POD_STARTUP_LAST = POD_STARTUP_SETUP - 1
40
+	POD_STARTUP_DONE,
4741 };
4842 
4943 enum {
....@@ -63,12 +57,6 @@
6357 	/* Instrument monitor level */
6458 	int monitor_level;
6559 
66
-	/* Timer for device initialization */
67
-	struct timer_list startup_timer;
68
-
69
-	/* Work handler for device initialization */
70
-	struct work_struct startup_work;
71
-
7260 	/* Current progress in startup procedure */
7361 	int startup_progress;
7462 
....@@ -81,6 +69,8 @@
8169 	/* Device ID */
8270 	int device_id;
8371 };
72
+
73
+#define line6_to_pod(x)		container_of(x, struct usb_line6_pod, line6)
8474 
8575 #define POD_SYSEX_CODE 3
8676 
....@@ -120,7 +110,7 @@
120110 	POD_BUSY_MIDISEND
121111 };
122112 
123
-static struct snd_ratden pod_ratden = {
113
+static const struct snd_ratden pod_ratden = {
124114 	.num_min = 78125,
125115 	.num_max = 78125,
126116 	.num_step = 1,
....@@ -169,13 +159,10 @@
169159 	.bytes_per_channel = 3 /* SNDRV_PCM_FMTBIT_S24_3LE */
170160 };
171161 
172
-static const char pod_version_header[] = {
173
-	0xf2, 0x7e, 0x7f, 0x06, 0x02
174
-};
175162 
176
-/* forward declarations: */
177
-static void pod_startup2(struct timer_list *t);
178
-static void pod_startup3(struct usb_line6_pod *pod);
163
+static const char pod_version_header[] = {
164
+	0xf0, 0x7e, 0x7f, 0x06, 0x02
165
+};
179166 
180167 static char *pod_alloc_sysex_buffer(struct usb_line6_pod *pod, int code,
181168 				    int size)
....@@ -189,14 +176,17 @@
189176 */
190177 static void line6_pod_process_message(struct usb_line6 *line6)
191178 {
192
-	struct usb_line6_pod *pod = (struct usb_line6_pod *) line6;
179
+	struct usb_line6_pod *pod = line6_to_pod(line6);
193180 	const unsigned char *buf = pod->line6.buffer_message;
194181 
195182 	if (memcmp(buf, pod_version_header, sizeof(pod_version_header)) == 0) {
196183 		pod->firmware_version = buf[13] * 100 + buf[14] * 10 + buf[15];
197184 		pod->device_id = ((int)buf[8] << 16) | ((int)buf[9] << 8) |
198185 				 (int) buf[10];
199
-		pod_startup3(pod);
186
+		if (pod->startup_progress == POD_STARTUP_VERSIONREQ) {
187
+			pod->startup_progress = POD_STARTUP_SETUP;
188
+			schedule_delayed_work(&line6->startup_work, 0);
189
+		}
200190 		return;
201191 	}
202192 
....@@ -281,46 +271,27 @@
281271 	context). After the last one has finished, the device is ready to use.
282272 */
283273 
284
-static void pod_startup1(struct usb_line6_pod *pod)
274
+static void pod_startup(struct usb_line6 *line6)
285275 {
286
-	CHECK_STARTUP_PROGRESS(pod->startup_progress, POD_STARTUP_INIT);
276
+	struct usb_line6_pod *pod = line6_to_pod(line6);
287277 
288
-	/* delay startup procedure: */
289
-	line6_start_timer(&pod->startup_timer, POD_STARTUP_DELAY, pod_startup2);
290
-}
278
+	switch (pod->startup_progress) {
279
+	case POD_STARTUP_VERSIONREQ:
280
+		/* request firmware version: */
281
+		line6_version_request_async(line6);
282
+		break;
283
+	case POD_STARTUP_SETUP:
284
+		/* serial number: */
285
+		line6_read_serial_number(&pod->line6, &pod->serial_number);
291286 
292
-static void pod_startup2(struct timer_list *t)
293
-{
294
-	struct usb_line6_pod *pod = from_timer(pod, t, startup_timer);
295
-	struct usb_line6 *line6 = &pod->line6;
296
-
297
-	CHECK_STARTUP_PROGRESS(pod->startup_progress, POD_STARTUP_VERSIONREQ);
298
-
299
-	/* request firmware version: */
300
-	line6_version_request_async(line6);
301
-}
302
-
303
-static void pod_startup3(struct usb_line6_pod *pod)
304
-{
305
-	CHECK_STARTUP_PROGRESS(pod->startup_progress, POD_STARTUP_WORKQUEUE);
306
-
307
-	/* schedule work for global work queue: */
308
-	schedule_work(&pod->startup_work);
309
-}
310
-
311
-static void pod_startup4(struct work_struct *work)
312
-{
313
-	struct usb_line6_pod *pod =
314
-	    container_of(work, struct usb_line6_pod, startup_work);
315
-	struct usb_line6 *line6 = &pod->line6;
316
-
317
-	CHECK_STARTUP_PROGRESS(pod->startup_progress, POD_STARTUP_SETUP);
318
-
319
-	/* serial number: */
320
-	line6_read_serial_number(&pod->line6, &pod->serial_number);
321
-
322
-	/* ALSA audio interface: */
323
-	snd_card_register(line6->card);
287
+		/* ALSA audio interface: */
288
+		if (snd_card_register(line6->card))
289
+			dev_err(line6->ifcdev, "Failed to register POD card.\n");
290
+		pod->startup_progress = POD_STARTUP_DONE;
291
+		break;
292
+	default:
293
+		break;
294
+	}
324295 }
325296 
326297 /* POD special files: */
....@@ -356,7 +327,7 @@
356327 				       struct snd_ctl_elem_value *ucontrol)
357328 {
358329 	struct snd_line6_pcm *line6pcm = snd_kcontrol_chip(kcontrol);
359
-	struct usb_line6_pod *pod = (struct usb_line6_pod *)line6pcm->line6;
330
+	struct usb_line6_pod *pod = line6_to_pod(line6pcm->line6);
360331 
361332 	ucontrol->value.integer.value[0] = pod->monitor_level;
362333 	return 0;
....@@ -367,7 +338,7 @@
367338 				       struct snd_ctl_elem_value *ucontrol)
368339 {
369340 	struct snd_line6_pcm *line6pcm = snd_kcontrol_chip(kcontrol);
370
-	struct usb_line6_pod *pod = (struct usb_line6_pod *)line6pcm->line6;
341
+	struct usb_line6_pod *pod = line6_to_pod(line6pcm->line6);
371342 
372343 	if (ucontrol->value.integer.value[0] == pod->monitor_level)
373344 		return 0;
....@@ -390,30 +361,16 @@
390361 };
391362 
392363 /*
393
-	POD device disconnected.
394
-*/
395
-static void line6_pod_disconnect(struct usb_line6 *line6)
396
-{
397
-	struct usb_line6_pod *pod = (struct usb_line6_pod *)line6;
398
-
399
-	del_timer_sync(&pod->startup_timer);
400
-	cancel_work_sync(&pod->startup_work);
401
-}
402
-
403
-/*
404364 	 Try to init POD device.
405365 */
406366 static int pod_init(struct usb_line6 *line6,
407367 		    const struct usb_device_id *id)
408368 {
409369 	int err;
410
-	struct usb_line6_pod *pod = (struct usb_line6_pod *) line6;
370
+	struct usb_line6_pod *pod = line6_to_pod(line6);
411371 
412372 	line6->process_message = line6_pod_process_message;
413
-	line6->disconnect = line6_pod_disconnect;
414
-
415
-	timer_setup(&pod->startup_timer, NULL, 0);
416
-	INIT_WORK(&pod->startup_work, pod_startup4);
373
+	line6->startup = pod_startup;
417374 
418375 	/* create sysfs entries: */
419376 	err = snd_card_add_dev_attr(line6->card, &pod_dev_attr_group);
....@@ -441,7 +398,8 @@
441398 		pod->monitor_level = POD_SYSTEM_INVALID;
442399 
443400 		/* initiate startup procedure: */
444
-		pod_startup1(pod);
401
+		schedule_delayed_work(&line6->startup_work,
402
+				      msecs_to_jiffies(POD_STARTUP_DELAY));
445403 	}
446404 
447405 	return 0;