Merge tag 'char-misc-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / drivers / misc / mei / pci-me.c

diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 8cf636c5403225f7588a2428318cec1ff7fd2700..b5757993c9b2af992c54468a75e630c080bcad61 100644 (file)
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -297,11 +297,7 @@ end:
  */
 static void mei_me_shutdown(struct pci_dev *pdev)
 {
-       struct mei_device *dev;
-
-       dev = pci_get_drvdata(pdev);
-       if (!dev)
-               return;
+       struct mei_device *dev = pci_get_drvdata(pdev);
 
        dev_dbg(&pdev->dev, "shutdown\n");
        mei_stop(dev);
@@ -322,11 +318,7 @@ static void mei_me_shutdown(struct pci_dev *pdev)
  */
 static void mei_me_remove(struct pci_dev *pdev)
 {
-       struct mei_device *dev;
-
-       dev = pci_get_drvdata(pdev);
-       if (!dev)
-               return;
+       struct mei_device *dev = pci_get_drvdata(pdev);
 
        if (mei_pg_is_enabled(dev))
                pm_runtime_get_noresume(&pdev->dev);
@@ -355,9 +347,6 @@ static int mei_me_pci_suspend(struct device *device)
        struct pci_dev *pdev = to_pci_dev(device);
        struct mei_device *dev = pci_get_drvdata(pdev);
 
-       if (!dev)
-               return -ENODEV;
-
        dev_dbg(&pdev->dev, "suspend\n");
 
        mei_stop(dev);
@@ -373,14 +362,10 @@ static int mei_me_pci_suspend(struct device *device)
 static int mei_me_pci_resume(struct device *device)
 {
        struct pci_dev *pdev = to_pci_dev(device);
-       struct mei_device *dev;
+       struct mei_device *dev = pci_get_drvdata(pdev);
        unsigned int irqflags;
        int err;
 
-       dev = pci_get_drvdata(pdev);
-       if (!dev)
-               return -ENODEV;
-
        pci_enable_msi(pdev);
 
        irqflags = pci_dev_msi_enabled(pdev) ? IRQF_ONESHOT : IRQF_SHARED;
@@ -421,13 +406,10 @@ static void mei_me_pci_complete(struct device *device)
 #ifdef CONFIG_PM
 static int mei_me_pm_runtime_idle(struct device *device)
 {
-       struct mei_device *dev;
+       struct mei_device *dev = dev_get_drvdata(device);
 
        dev_dbg(device, "rpm: me: runtime_idle\n");
 
-       dev = dev_get_drvdata(device);
-       if (!dev)
-               return -ENODEV;
        if (mei_write_is_idle(dev))
                pm_runtime_autosuspend(device);
 
@@ -436,15 +418,11 @@ static int mei_me_pm_runtime_idle(struct device *device)
 
 static int mei_me_pm_runtime_suspend(struct device *device)
 {
-       struct mei_device *dev;
+       struct mei_device *dev = dev_get_drvdata(device);
        int ret;
 
        dev_dbg(device, "rpm: me: runtime suspend\n");
 
-       dev = dev_get_drvdata(device);
-       if (!dev)
-               return -ENODEV;
-
        mutex_lock(&dev->device_lock);
 
        if (mei_write_is_idle(dev))
@@ -464,15 +442,11 @@ static int mei_me_pm_runtime_suspend(struct device *device)
 
 static int mei_me_pm_runtime_resume(struct device *device)
 {
-       struct mei_device *dev;
+       struct mei_device *dev = dev_get_drvdata(device);
        int ret;
 
        dev_dbg(device, "rpm: me: runtime resume\n");
 
-       dev = dev_get_drvdata(device);
-       if (!dev)
-               return -ENODEV;
-
        mutex_lock(&dev->device_lock);
 
        ret = mei_me_pg_exit_sync(dev);