enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/drivers/media/usb/dvb-usb-v2/ec168.c
..
..
@@ -1,18 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * E3C EC168 DVB USB driver
3
4
  *
4
5
  * Copyright (C) 2009 Antti Palosaari <crope@iki.fi>
5
- *
6
- *    This program is free software; you can redistribute it and/or modify
7
- *    it under the terms of the GNU General Public License as published by
8
- *    the Free Software Foundation; either version 2 of the License, or
9
- *    (at your option) any later version.
10
- *
11
- *    This program is distributed in the hope that it will be useful,
12
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
- *    GNU General Public License for more details.
15
- *
16
6
  */
17
7
 
18
8
 #include "ec168.h"
..
..
@@ -319,7 +309,7 @@
319
309
 /* DVB USB Driver stuff */
320
310
 /* bInterfaceNumber 0 is HID
321
311
  * bInterfaceNumber 1 is DVB-T */
322
-static struct dvb_usb_device_properties ec168_props = {
312
+static const struct dvb_usb_device_properties ec168_props = {
323
313
 	.driver_name = KBUILD_MODNAME,
324
314
 	.owner = THIS_MODULE,
325
315
 	.adapter_nr = adapter_nr,
..
..
@@ -342,22 +332,17 @@
342
332
 	},
343
333
 };
344
334
 
345
-static const struct dvb_usb_driver_info ec168_driver_info = {
346
-	.name = "E3C EC168 reference design",
347
-	.props = &ec168_props,
348
-};
349
-
350
335
 static const struct usb_device_id ec168_id[] = {
351
-	{ USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168),
352
-		.driver_info = (kernel_ulong_t) &ec168_driver_info },
353
-	{ USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168_2),
354
-		.driver_info = (kernel_ulong_t) &ec168_driver_info },
355
-	{ USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168_3),
356
-		.driver_info = (kernel_ulong_t) &ec168_driver_info },
357
-	{ USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168_4),
358
-		.driver_info = (kernel_ulong_t) &ec168_driver_info },
359
-	{ USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168_5),
360
-		.driver_info = (kernel_ulong_t) &ec168_driver_info },
336
+	{ DVB_USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168,
337
+		     &ec168_props, "E3C EC168 reference design", NULL)},
338
+	{ DVB_USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168_2,
339
+		     &ec168_props, "E3C EC168 reference design", NULL)},
340
+	{ DVB_USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168_3,
341
+		     &ec168_props, "E3C EC168 reference design", NULL)},
342
+	{ DVB_USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168_4,
343
+		     &ec168_props, "E3C EC168 reference design", NULL)},
344
+	{ DVB_USB_DEVICE(USB_VID_E3C, USB_PID_E3C_EC168_5,
345
+		     &ec168_props, "E3C EC168 reference design", NULL)},
361
346
 	{}
362
347
 };
363
348
 MODULE_DEVICE_TABLE(usb, ec168_id);