mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-01 10:42:11 +00:00
mei: me: 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-4-helgaas@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
64386d1588
commit
e37db17dae
@ -295,11 +295,7 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
*/
|
||||
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);
|
||||
@ -320,11 +316,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);
|
||||
@ -353,9 +345,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);
|
||||
@ -371,14 +360,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;
|
||||
@ -419,13 +404,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);
|
||||
|
||||
@ -434,15 +416,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))
|
||||
@ -462,15 +440,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);
|
||||
|
Loading…
Reference in New Issue
Block a user