USB: disable rust bindings from the build for now

The rust USB bindings as submitted are a good start, but they don't
really seem to be correct in a number of minor places, so just disable
them from the build entirely at this point in time.  When they are ready
to be re-enabled, this commit can be reverted.

Acked-by: Daniel Almeida <daniel.almeida@collabora.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h
index 41cd42cd286f15bcd53909c7508643d3224ef733..9b3a4ab95818c937d5f520c88e56697d6efdf1d1 100644 (file)
--- a/rust/bindings/bindings_helper.h
+++ b/rust/bindings/bindings_helper.h
@@ -74,7 +74,6 @@
 #include <linux/slab.h>
 #include <linux/task_work.h>
 #include <linux/tracepoint.h>
-#include <linux/usb.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
 #include <linux/xarray.h>

diff --git a/rust/helpers/helpers.c b/rust/helpers/helpers.c
index 04103ab1a349502fb88dc7773b05fc587c251d1a..8e8277bdddcaeec1edebe18ffc4fe831c08a8455 100644 (file)
--- a/rust/helpers/helpers.c
+++ b/rust/helpers/helpers.c
@@ -48,7 +48,6 @@
 #include "task.c"
 #include "time.c"
 #include "uaccess.c"
-#include "usb.c"
 #include "vmalloc.c"
 #include "wait.c"
 #include "workqueue.c"

diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
index 004ca70b816dc620ffdfd59980e56cfe1c6756b3..99dbb7b2812e018ac45989487816ce020f38aa61 100644 (file)
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@ -127,8 +127,6 @@ pub mod time;
 pub mod tracepoint;
 pub mod transmute;
 pub mod types;
-#[cfg(CONFIG_USB = "y")]
-pub mod usb;
 pub mod uaccess;
 pub mod workqueue;
 pub mod xarray;

diff --git a/samples/rust/Kconfig b/samples/rust/Kconfig
index 6d6e4d8c88cb27e7a6ccecb4738db063f360165e..865a62a93ddc315f73266933e14daf1095e9f94c 100644 (file)
--- a/samples/rust/Kconfig
+++ b/samples/rust/Kconfig
@@ -85,7 +85,7 @@ config SAMPLE_RUST_DRIVER_PLATFORM
 
 config SAMPLE_RUST_DRIVER_USB
        tristate "USB Driver"
-       depends on USB = y
+       depends on USB = y && BROKEN
        help
          This option builds the Rust USB driver sample.