mei: txe: remove unnecessary NULL pointer checks

The .shutdown(), .remove(), and power management callbacks are never called
unless .probe() has already returned success, which means it has set
drvdata to a non-NULL pointer, so "dev" can never be NULL in the other
callbacks.

Remove the unnecessary checks.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20240229181300.352077-3-helgaas@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/mei/pci-txe.c b/drivers/misc/mei/pci-txe.c
index fa20d9a..2a58410 100644 (file)
--- a/drivers/misc/mei/pci-txe.c
+++ b/drivers/misc/mei/pci-txe.c
@@ -166,11 +166,7 @@ end:
  */
 static void mei_txe_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);
@@ -191,13 +187,7 @@ static void mei_txe_shutdown(struct pci_dev *pdev)
  */
 static void mei_txe_remove(struct pci_dev *pdev)
 {
-       struct mei_device *dev;
-
-       dev = pci_get_drvdata(pdev);
-       if (!dev) {
-               dev_err(&pdev->dev, "mei: dev == NULL\n");
-               return;
-       }
+       struct mei_device *dev = pci_get_drvdata(pdev);
 
        pm_runtime_get_noresume(&pdev->dev);
 
@@ -218,9 +208,6 @@ static int mei_txe_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);
@@ -236,13 +223,9 @@ static int mei_txe_pci_suspend(struct device *device)
 static int mei_txe_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);
        int err;
 
-       dev = pci_get_drvdata(pdev);
-       if (!dev)
-               return -ENODEV;
-
        pci_enable_msi(pdev);
 
        mei_clear_interrupts(dev);
@@ -273,13 +256,10 @@ static int mei_txe_pci_resume(struct device *device)
 #ifdef CONFIG_PM
 static int mei_txe_pm_runtime_idle(struct device *device)
 {
-       struct mei_device *dev;
+       struct mei_device *dev = dev_get_drvdata(device);
 
        dev_dbg(device, "rpm: txe: runtime_idle\n");
 
-       dev = dev_get_drvdata(device);
-       if (!dev)
-               return -ENODEV;
        if (mei_write_is_idle(dev))
                pm_runtime_autosuspend(device);
 
@@ -287,15 +267,11 @@ static int mei_txe_pm_runtime_idle(struct device *device)
 }
 static int mei_txe_pm_runtime_suspend(struct device *device)
 {
-       struct mei_device *dev;
+       struct mei_device *dev = dev_get_drvdata(device);
        int ret;
 
        dev_dbg(device, "rpm: txe: runtime suspend\n");
 
-       dev = dev_get_drvdata(device);
-       if (!dev)
-               return -ENODEV;
-
        mutex_lock(&dev->device_lock);
 
        if (mei_write_is_idle(dev))
@@ -317,15 +293,11 @@ static int mei_txe_pm_runtime_suspend(struct device *device)
 
 static int mei_txe_pm_runtime_resume(struct device *device)
 {
-       struct mei_device *dev;
+       struct mei_device *dev = dev_get_drvdata(device);
        int ret;
 
        dev_dbg(device, "rpm: txe: runtime resume\n");
 
-       dev = dev_get_drvdata(device);
-       if (!dev)
-               return -ENODEV;
-
        mutex_lock(&dev->device_lock);
 
        mei_enable_interrupts(dev);