iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mei: txe: remove unnecessary NULL pointer checks

Browse Source 
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>
This commit is contained in:
Bjorn Helgaas 2024-02-29 12:12:59 -06:00 committed by Greg Kroah-Hartman
parent d6543805a8
commit 64386d1588
1 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/misc/mei/pci-txe.c
View File

@ -166,11 +166,7 @@ end:
*/ */
static void mei_txe_shutdown(struct pci_dev *pdev) static void mei_txe_shutdown(struct pci_dev *pdev)
{ {
struct mei_device *dev; struct mei_device *dev = pci_get_drvdata(pdev);
dev = pci_get_drvdata(pdev);
if (!dev)
return;
dev_dbg(&pdev->dev, "shutdown\n"); dev_dbg(&pdev->dev, "shutdown\n");
mei_stop(dev); 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) static void mei_txe_remove(struct pci_dev *pdev)
{ {
struct mei_device *dev; struct mei_device *dev = pci_get_drvdata(pdev);
dev = pci_get_drvdata(pdev);
if (!dev) {
dev_err(&pdev->dev, "mei: dev == NULL\n");
return;
}
pm_runtime_get_noresume(&pdev->dev); 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 pci_dev *pdev = to_pci_dev(device);
struct mei_device *dev = pci_get_drvdata(pdev); struct mei_device *dev = pci_get_drvdata(pdev);
if (!dev)
return -ENODEV;
dev_dbg(&pdev->dev, "suspend\n"); dev_dbg(&pdev->dev, "suspend\n");
mei_stop(dev); 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) static int mei_txe_pci_resume(struct device *device)
{ {
struct pci_dev *pdev = to_pci_dev(device); struct pci_dev *pdev = to_pci_dev(device);
struct mei_device *dev; struct mei_device *dev = pci_get_drvdata(pdev);
int err; int err;
dev = pci_get_drvdata(pdev);
if (!dev)
return -ENODEV;
pci_enable_msi(pdev); pci_enable_msi(pdev);
mei_clear_interrupts(dev); mei_clear_interrupts(dev);
@ -273,13 +256,10 @@ static int mei_txe_pci_resume(struct device *device)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int mei_txe_pm_runtime_idle(struct device *device) 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_dbg(device, "rpm: txe: runtime_idle\n");
dev = dev_get_drvdata(device);
if (!dev)
return -ENODEV;
if (mei_write_is_idle(dev)) if (mei_write_is_idle(dev))
pm_runtime_autosuspend(device); 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) static int mei_txe_pm_runtime_suspend(struct device *device)
{ {
struct mei_device *dev; struct mei_device *dev = dev_get_drvdata(device);
int ret; int ret;
dev_dbg(device, "rpm: txe: runtime suspend\n"); dev_dbg(device, "rpm: txe: runtime suspend\n");
dev = dev_get_drvdata(device);
if (!dev)
return -ENODEV;
mutex_lock(&dev->device_lock); mutex_lock(&dev->device_lock);
if (mei_write_is_idle(dev)) 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) static int mei_txe_pm_runtime_resume(struct device *device)
{ {
struct mei_device *dev; struct mei_device *dev = dev_get_drvdata(device);
int ret; int ret;
dev_dbg(device, "rpm: txe: runtime resume\n"); dev_dbg(device, "rpm: txe: runtime resume\n");
dev = dev_get_drvdata(device);
if (!dev)
return -ENODEV;
mutex_lock(&dev->device_lock); mutex_lock(&dev->device_lock);
mei_enable_interrupts(dev); mei_enable_interrupts(dev);