Fix sample testplan

Cleanup sample.yaml file

Signed-off-by: Mohamed ElShahawi <[email protected]>

Author: ExtremeGTX

samples/subsys/usb/mtp/sample.yaml

@@ -1,36 +1,11 @@
 sample:
-  name: MTP USB
+  name: USB MTP device class sample
 tests:
-  sample.usb.mtp:
-    depends_on: usb_device
-    tags: usb
-    arch_exclude: posix
-    harness: console
-    harness_config:
-      type: one_line
-      regex:
-        - "Wait for DTR"
   sample.usb_device_next.mtp:
     depends_on: usbd
     tags: usb
-    extra_args: CONF_FILE="usbd_next_prj.conf"
-    integration_platforms:
-      - nrf52840dk/nrf52840
-      - nrf54h20dk/nrf54h20/cpuapp
-      - frdm_k64f
-      - stm32f723e_disco
-      - nucleo_f413zh
-      - mimxrt685_evk/mimxrt685s/cm33
-      - mimxrt1060_evk
     harness: console
     harness_config:
       type: one_line
       regex:
-        - "Wait for DTR"
-  sample.usb.mtp.buildonly:
-    depends_on: usb_device
-    tags: usb
-    arch_allow: posix
-    build_only: true
-    integration_platforms:
-      - native_sim
+        - "USB device support enabled"

samples/subsys/usb/mtp/src/main.c

@@ -21,8 +21,6 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_mtp_sample, LOG_LEVEL_INF);
 
-static struct usbd_context *sample_usbd;
-
 static void sample_msg_cb(struct usbd_context *const ctx, const struct usbd_msg *msg)
 {
 	LOG_INF("USBD message: %s", usbd_msg_type_string(msg->type));
@@ -42,36 +40,21 @@ static void sample_msg_cb(struct usbd_context *const ctx, const struct usbd_msg
 	}
 }
 
-static int enable_usb_device_next(void)
+int main(void)
 {
-	int err;
+	struct usbd_context *sample_usbd;
 
 	sample_usbd = sample_usbd_init_device(sample_msg_cb);
 	if (sample_usbd == NULL) {
 		LOG_ERR("Failed to initialize USB device");
-		return -ENODEV;
+		return -1;
 	}
 
-	if (!usbd_can_detect_vbus(sample_usbd)) {
-		err = usbd_enable(sample_usbd);
-		if (err) {
-			LOG_ERR("Failed to enable device support");
-			return err;
-		}
+	if (usbd_enable(sample_usbd)) {
+		LOG_ERR("Failed to enable device support");
+		return -1;
 	}
 
-	LOG_INF("USB device support enabled");
-
-	return 0;
-}
-
-int main(void)
-{
-	int ret;
-#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
-	ret = enable_usb_device_next();
-#else
-	#error "Only Device next is supported"
-#endif
+	LOG_INF("USB device support enabled\n");
 	return 0;
 }