1 files changed, 23 insertions, 48 deletions

diff --git a/drivers/ps3/vuart.h b/drivers/ps3/vuart.h
index 1be992d568c8..eb7f6d94a890 100644
--- a/drivers/ps3/vuart.h
+++ b/drivers/ps3/vuart.h
@@ -34,29 +34,7 @@ struct ps3_vuart_stats {
 struct ps3_vuart_work {
         struct work_struct work;
         unsigned long trigger;
-        spinlock_t lock;
-        struct ps3_vuart_port_device* dev; /* to convert work to device */
-};
-
-/**
- * struct ps3_vuart_port_priv - private vuart device data.
- */
-
-struct ps3_vuart_port_priv {
-        unsigned int port_number;
-        u64 interrupt_mask;
-
-        struct {
-                spinlock_t lock;
-                struct list_head head;
-        } tx_list;
-        struct {
-                unsigned long bytes_held;
-                spinlock_t lock;
-                struct list_head head;
-        } rx_list;
-        struct ps3_vuart_stats stats;
-        struct ps3_vuart_work work;
+        struct ps3_system_bus_device *dev; /* to convert work to device */
 };
 
 /**
@@ -64,32 +42,30 @@ struct ps3_vuart_port_priv {
  */
 
 struct ps3_vuart_port_driver {
-        enum ps3_match_id match_id;
-        struct device_driver core;
-        int (*probe)(struct ps3_vuart_port_device *);
-        int (*remove)(struct ps3_vuart_port_device *);
-        void (*shutdown)(struct ps3_vuart_port_device *);
-        int (*tx_event)(struct ps3_vuart_port_device *dev);
-        int (*rx_event)(struct ps3_vuart_port_device *dev);
-        int (*disconnect_event)(struct ps3_vuart_port_device *dev);
-        /* int (*suspend)(struct ps3_vuart_port_device *, pm_message_t); */
-        /* int (*resume)(struct ps3_vuart_port_device *); */
+        struct ps3_system_bus_driver core;
+        int (*probe)(struct ps3_system_bus_device *);
+        int (*remove)(struct ps3_system_bus_device *);
+        void (*shutdown)(struct ps3_system_bus_device *);
+        void (*work)(struct ps3_system_bus_device *);
+        /* int (*tx_event)(struct ps3_system_bus_device *dev); */
+        /* int (*rx_event)(struct ps3_system_bus_device *dev); */
+        /* int (*disconnect_event)(struct ps3_system_bus_device *dev); */
+        /* int (*suspend)(struct ps3_system_bus_device *, pm_message_t); */
+        /* int (*resume)(struct ps3_system_bus_device *); */
 };
 
 int ps3_vuart_port_driver_register(struct ps3_vuart_port_driver *drv);
 void ps3_vuart_port_driver_unregister(struct ps3_vuart_port_driver *drv);
 
-static inline struct ps3_vuart_port_driver *to_ps3_vuart_port_driver(
-        struct device_driver *_drv)
-{
-        return container_of(_drv, struct ps3_vuart_port_driver, core);
-}
-static inline struct ps3_vuart_port_device *to_ps3_vuart_port_device(
-        struct device *_dev)
+static inline struct ps3_vuart_port_driver *
+        ps3_system_bus_dev_to_vuart_drv(struct ps3_system_bus_device *_dev)
 {
-        return container_of(_dev, struct ps3_vuart_port_device, core);
+        struct ps3_system_bus_driver *sbd =
+                ps3_system_bus_dev_to_system_bus_drv(_dev);
+        BUG_ON(!sbd);
+        return container_of(sbd, struct ps3_vuart_port_driver, core);
 }
-static inline struct ps3_vuart_port_device *ps3_vuart_work_to_port_device(
+static inline struct ps3_system_bus_device *ps3_vuart_work_to_system_bus_dev(
         struct work_struct *_work)
 {
         struct ps3_vuart_work *vw = container_of(_work, struct ps3_vuart_work,
@@ -97,14 +73,13 @@ static inline struct ps3_vuart_port_device *ps3_vuart_work_to_port_device(
         return vw->dev;
 }
 
-int ps3_vuart_write(struct ps3_vuart_port_device *dev, const void* buf,
-        unsigned int bytes);
-int ps3_vuart_read(struct ps3_vuart_port_device *dev, void* buf,
+int ps3_vuart_write(struct ps3_system_bus_device *dev, const void *buf,
         unsigned int bytes);
-int ps3_vuart_read_async(struct ps3_vuart_port_device *dev, work_func_t func,
+int ps3_vuart_read(struct ps3_system_bus_device *dev, void *buf,
         unsigned int bytes);
-void ps3_vuart_cancel_async(struct ps3_vuart_port_device *dev);
-void ps3_vuart_clear_rx_bytes(struct ps3_vuart_port_device *dev,
+int ps3_vuart_read_async(struct ps3_system_bus_device *dev, unsigned int bytes);
+void ps3_vuart_cancel_async(struct ps3_system_bus_device *dev);
+void ps3_vuart_clear_rx_bytes(struct ps3_system_bus_device *dev,
         unsigned int bytes);
 
 #endif