Merge tag 'pm-5.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[linux-2.6-microblaze.git] / drivers / ps3 / ps3-vuart.c

diff --git a/drivers/ps3/ps3-vuart.c b/drivers/ps3/ps3-vuart.c
index 4ed131e..e34ae6a 100644 (file)
--- a/drivers/ps3/ps3-vuart.c
+++ b/drivers/ps3/ps3-vuart.c
@@ -1102,7 +1102,7 @@ static int ps3_vuart_cleanup(struct ps3_system_bus_device *dev)
  * device can no longer be used.
  */
 
-static int ps3_vuart_remove(struct ps3_system_bus_device *dev)
+static void ps3_vuart_remove(struct ps3_system_bus_device *dev)
 {
        struct ps3_vuart_port_priv *priv = to_port_priv(dev);
        struct ps3_vuart_port_driver *drv;
@@ -1118,7 +1118,7 @@ static int ps3_vuart_remove(struct ps3_system_bus_device *dev)
                dev_dbg(&dev->core, "%s:%d: no driver bound\n", __func__,
                        __LINE__);
                mutex_unlock(&vuart_bus_priv.probe_mutex);
-               return 0;
+               return;
        }
 
        drv = ps3_system_bus_dev_to_vuart_drv(dev);
@@ -1141,7 +1141,6 @@ static int ps3_vuart_remove(struct ps3_system_bus_device *dev)
 
        dev_dbg(&dev->core, " <- %s:%d\n", __func__, __LINE__);
        mutex_unlock(&vuart_bus_priv.probe_mutex);
-       return 0;
 }
 
 /**
@@ -1154,7 +1153,7 @@ static int ps3_vuart_remove(struct ps3_system_bus_device *dev)
  * sequence.
  */
 
-static int ps3_vuart_shutdown(struct ps3_system_bus_device *dev)
+static void ps3_vuart_shutdown(struct ps3_system_bus_device *dev)
 {
        struct ps3_vuart_port_driver *drv;
 
@@ -1169,7 +1168,7 @@ static int ps3_vuart_shutdown(struct ps3_system_bus_device *dev)
                dev_dbg(&dev->core, "%s:%d: no driver bound\n", __func__,
                        __LINE__);
                mutex_unlock(&vuart_bus_priv.probe_mutex);
-               return 0;
+               return;
        }
 
        drv = ps3_system_bus_dev_to_vuart_drv(dev);
@@ -1193,7 +1192,6 @@ static int ps3_vuart_shutdown(struct ps3_system_bus_device *dev)
        dev_dbg(&dev->core, " <- %s:%d\n", __func__, __LINE__);
 
        mutex_unlock(&vuart_bus_priv.probe_mutex);
-       return 0;
 }
 
 static int __init ps3_vuart_bus_init(void)