sample/tests: remove CONFIG_USB_COMPOSITE_DEVICE usage

This is no longer necessary, as this option is selected as a dependency
for class implementations where it is required.
Also remove redundant test cases.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>

samples/net/sockets/echo_server/sample.yaml

@@ -84,15 +84,6 @@ tests:
     tags:
       - net
       - usb
-  sample.net.sockets.echo_server.usbnet_composite:
-    depends_on: usb_device
-    harness: net
-    extra_args: OVERLAY_CONFIG="overlay-netusb.conf"
-    extra_configs:
-      - CONFIG_USB_COMPOSITE_DEVICE=y
-    tags:
-      - net
-      - usb
   sample.net.sockets.echo_server.nrf_openthread:
     extra_args: OVERLAY_CONFIG="overlay-ot.conf"
     slow: true

samples/subsys/usb/cdc_acm/overlay-composite-cdc-dfu.conf

@@ -6,8 +6,6 @@
 # (does not re-enumerates) and thus make it unable for the device
 # to restart in DFU mode.
 
-CONFIG_USB_COMPOSITE_DEVICE=y
-
 CONFIG_USB_DFU_CLASS=y
 CONFIG_FLASH=y
 CONFIG_IMG_MANAGER=y

samples/subsys/usb/cdc_acm/overlay-composite-cdc-msc.conf

@@ -1,8 +1,6 @@
 # Overlay file for composite configuration
 # CDC ACM + Mass Storage (RAM)
 
-CONFIG_USB_COMPOSITE_DEVICE=y
-
 CONFIG_USB_MASS_STORAGE=y
 CONFIG_USB_MASS_STORAGE_LOG_LEVEL_ERR=y
 

samples/subsys/usb/cdc_acm_composite/prj.conf

@@ -7,7 +7,6 @@ CONFIG_UART_LINE_CTRL=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Zephyr CDC ACM Composite sample"
 CONFIG_USB_DEVICE_PID=0x0002
-CONFIG_USB_COMPOSITE_DEVICE=y
 CONFIG_USB_CDC_ACM_RINGBUF_SIZE=512
 CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
 

samples/subsys/usb/hid-cdc/prj.conf

@@ -1,4 +1,3 @@
-CONFIG_USB_COMPOSITE_DEVICE=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Zephyr HID and CDC ACM sample"
 CONFIG_USB_DEVICE_PID=0x0003

samples/subsys/usb/hid/sample.yaml

@@ -11,18 +11,6 @@ tests:
       regex:
         - "main: HID Device: dev"
         - "main: Starting application"
-  sample.usb.hid_composite:
-    depends_on: usb_device
-    extra_configs:
-      - CONFIG_USB_COMPOSITE_DEVICE=y
-    tags: usb
-    arch_exclude: posix
-    harness: console
-    harness_config:
-      type: multi_line
-      regex:
-        - "main: HID Device: dev"
-        - "main: Starting application"
   sample.usb.hid.buildonly:
     depends_on: usb_device
     tags: usb

tests/subsys/usb/desc_sections/prj.conf

@@ -1,6 +1,5 @@
 CONFIG_ZTEST=y
 CONFIG_USB_DEVICE_STACK=y
-CONFIG_USB_COMPOSITE_DEVICE=n
 CONFIG_USB_DEVICE_LOG_LEVEL_DBG=y
 
 CONFIG_LOG=y

tests/subsys/usb/desc_sections/src/desc_sections.c

@@ -14,10 +14,6 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(test_main, LOG_LEVEL_DBG);
 
-#ifdef CONFIG_USB_COMPOSITE_DEVICE
-#error Do not use composite configuration
-#endif
-
 /* Linker-defined symbols bound the USB descriptor structs */
 extern struct usb_desc_header __usb_descriptor_start[];
 extern struct usb_desc_header __usb_descriptor_end[];