Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[firefly-linux-kernel-4.4.55.git] / drivers / spmi / spmi.c

diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c
index 1d92f5103ebfe885028a28b93aa9fcef87921d39..94938436aef9c7313403882141a8fc1858413190 100644 (file)
--- a/drivers/spmi/spmi.c
+++ b/drivers/spmi/spmi.c
@@ -1,4 +1,5 @@
-/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+/*
+ * Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -316,11 +317,6 @@ static int spmi_drv_probe(struct device *dev)
        struct spmi_device *sdev = to_spmi_device(dev);
        int err;
 
-       /* Ensure the slave is in ACTIVE state */
-       err = spmi_command_wakeup(sdev);
-       if (err)
-               goto fail_wakeup;
-
        pm_runtime_get_noresume(dev);
        pm_runtime_set_active(dev);
        pm_runtime_enable(dev);
@@ -335,7 +331,6 @@ fail_probe:
        pm_runtime_disable(dev);
        pm_runtime_set_suspended(dev);
        pm_runtime_put_noidle(dev);
-fail_wakeup:
        return err;
 }