1 files changed, 2 insertions, 33 deletions

diff --git a/drivers/ps3/ps3av_cmd.c b/drivers/ps3/ps3av_cmd.c
index 7c4fb264dda2..f72f5ddf18e4 100644
--- a/drivers/ps3/ps3av_cmd.c
+++ b/drivers/ps3/ps3av_cmd.c
@@ -868,7 +868,7 @@ int ps3av_cmd_avb_param(struct ps3av_pkt_avb_param *avb, u32 send_len)
 {
         int res;
 
-        ps3fb_flip_ctl(0);      /* flip off */
+        ps3av_flip_ctl(0);      /* flip off */
 
         /* avb packet */
         res = ps3av_do_pkt(PS3AV_CID_AVB_PARAM, send_len, sizeof(*avb),
@@ -882,7 +882,7 @@ int ps3av_cmd_avb_param(struct ps3av_pkt_avb_param *avb, u32 send_len)
                          res);
 
       out:
-        ps3fb_flip_ctl(1);      /* flip on */
+        ps3av_flip_ctl(1);      /* flip on */
         return res;
 }
 
@@ -1003,34 +1003,3 @@ void ps3av_cmd_av_monitor_info_dump(const struct ps3av_pkt_av_get_monitor_info *
                 | PS3AV_CMD_AV_LAYOUT_176 \
                 | PS3AV_CMD_AV_LAYOUT_192)
 
-/************************* vuart ***************************/
-
-#define POLLING_INTERVAL  25    /* in msec */
-
-int ps3av_vuart_write(struct ps3_vuart_port_device *dev, const void *buf,
-                      unsigned long size)
-{
-        int error = ps3_vuart_write(dev, buf, size);
-        return error ? error : size;
-}
-
-int ps3av_vuart_read(struct ps3_vuart_port_device *dev, void *buf,
-                     unsigned long size, int timeout)
-{
-        int error;
-        int loopcnt = 0;
-
-        timeout = (timeout + POLLING_INTERVAL - 1) / POLLING_INTERVAL;
-        while (loopcnt++ <= timeout) {
-                error = ps3_vuart_read(dev, buf, size);
-                if (!error)
-                        return size;
-                if (error != -EAGAIN) {
-                        printk(KERN_ERR "%s: ps3_vuart_read failed %d\n",
-                               __func__, error);
-                        return error;
-                }
-                msleep(POLLING_INTERVAL);
-        }
-        return -EWOULDBLOCK;
-}