Skip to content

Commit

Permalink
mei: txe: remove unnecessary NULL pointer checks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
bjorn-helgaas authored and gregkh committed Mar 5, 2024
1 parent d654380 commit 64386d1
Showing 1 changed file with 6 additions and 34 deletions.
40 changes: 6 additions & 34 deletions drivers/misc/mei/pci-txe.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,7 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
*/
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);
Expand All @@ -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);

Expand All @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -273,29 +256,22 @@ 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);

return -EBUSY;
}
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))
Expand All @@ -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);
Expand Down

0 comments on commit 64386d1

Please sign in to comment.