devices: gpu: random cleanup

- Remove unused phantom data
- scannout --> scanout

BUG=none
TEST=compile

Change-Id: I5054833025eef5be766b547fa3e61d2ca46e226f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2211154
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Auto-Submit: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: David Riley <davidriley@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Commit-Queue: Gurchetan Singh <gurchetansingh@chromium.org>

2 files changed, 6 insertions, 18 deletions

diff --git a/devices/src/virtio/gpu/virtio_backend.rs b/devices/src/virtio/gpu/virtio_backend.rs
index bb1db4a..3200fa2 100644
--- a/devices/src/virtio/gpu/virtio_backend.rs
+++ b/devices/src/virtio/gpu/virtio_backend.rs
@@ -124,9 +124,9 @@ impl VirtioBackend {
     ) -> GpuResponse {
         let mut response = GpuResponse::OkNoData;
 
-        if let Some(scannout_resource_id) = self.scanout_resource_id {
-            if scannout_resource_id.get() == resource_id {
-                response = self.flush_scannout_resource_to_surface(resource);
+        if let Some(scanout_resource_id) = self.scanout_resource_id {
+            if scanout_resource_id.get() == resource_id {
+                response = self.flush_scanout_resource_to_surface(resource);
             }
         }
 
@@ -143,7 +143,7 @@ impl VirtioBackend {
         response
     }
 
-    pub fn flush_scannout_resource_to_surface(
+    pub fn flush_scanout_resource_to_surface(
         &mut self,
         resource: &mut dyn VirtioResource,
     ) -> GpuResponse {
diff --git a/gpu_renderer/src/lib.rs b/gpu_renderer/src/lib.rs
index 5e5ab95..1db066c 100644
--- a/gpu_renderer/src/lib.rs
+++ b/gpu_renderer/src/lib.rs
@@ -13,7 +13,6 @@ use std::cell::RefCell;
 use std::ffi::CString;
 use std::fmt::{self, Display};
 use std::fs::File;
-use std::marker::PhantomData;
 use std::mem::{size_of, transmute};
 use std::os::raw::{c_char, c_void};
 use std::os::unix::io::FromRawFd;
@@ -222,7 +221,6 @@ impl From<RendererFlags> for i32 {
 
 /// The global renderer handle used to query capability sets, and create resources and contexts.
 pub struct Renderer {
-    no_sync_send: PhantomData<*mut ()>,
     fence_state: Rc<RefCell<FenceState>>,
 }
 
@@ -266,10 +264,7 @@ impl Renderer {
         };
         ret_to_res(ret)?;
 
-        Ok(Renderer {
-            no_sync_send: PhantomData,
-            fence_state,
-        })
+        Ok(Renderer { fence_state })
     }
 
     /// Gets the version and size for the given capability set ID.
@@ -309,10 +304,7 @@ impl Renderer {
             )
         };
         ret_to_res(ret)?;
-        Ok(Context {
-            id,
-            no_sync_send: PhantomData,
-        })
+        Ok(Context { id })
     }
 
     /// Creates a resource with the given arguments.
@@ -328,7 +320,6 @@ impl Renderer {
             id: args.handle,
             backing_iovecs: Vec::new(),
             backing_mem: None,
-            no_sync_send: PhantomData,
         })
     }
 
@@ -453,7 +444,6 @@ impl Renderer {
                 id: resource_id,
                 backing_iovecs: iovecs,
                 backing_mem: None,
-                no_sync_send: PhantomData,
             })
         }
         #[cfg(not(feature = "virtio-gpu-next"))]
@@ -486,7 +476,6 @@ impl Renderer {
 /// A context in which resources can be attached/detached and commands can be submitted.
 pub struct Context {
     id: u32,
-    no_sync_send: PhantomData<*mut ()>,
 }
 
 impl Context {
@@ -543,7 +532,6 @@ pub struct Resource {
     id: u32,
     backing_iovecs: Vec<VirglVec>,
     backing_mem: Option<GuestMemory>,
-    no_sync_send: PhantomData<*mut ()>,
 }
 
 impl Resource {