misc: Use dev_get_drvdata where possible
Subsystems (2)
PATCH 1/1 misc: Use dev_get_drvdata where possible
Instead of using to_pci_dev + pci_get_drvdata,
use dev_get_drvdata to make code simpler.
Signed-off-by Chuhong Yuan <[email protected]>
--- drivers/misc/cardreader/alcor_pci.c | 6 ++---- drivers/misc/habanalabs/habanalabs_drv.c | 6 ++---- drivers/misc/mei/pci-me.c | 19 ++++++++----------- drivers/misc/mei/pci-txe.c | 19 ++++++++----------- 4 files changed, 20 insertions(+), 30 deletions(-)
drivers/misc/cardreader/alcor_pci.c +2 -4
@@ -334,8 +334,7 @@ static void alcor_pci_remove(struct pci_dev *pdev)#ifdef CONFIG_PM_SLEEP static int alcor_suspend (struct device *dev) { -struct pci_dev *pdev =to_pci_dev (dev); -struct alcor_pci_priv *priv =pci_get_drvdata (pdev); +struct alcor_pci_priv *priv =dev_get_drvdata (dev);alcor_pci_aspm_ctrl (priv,1 );return 0 ;
@@ -344,8 +343,7 @@ static int alcor_suspend(struct device *dev)static int alcor_resume (struct device *dev) { -struct pci_dev *pdev =to_pci_dev (dev); -struct alcor_pci_priv *priv =pci_get_drvdata (pdev); +struct alcor_pci_priv *priv =dev_get_drvdata (dev);alcor_pci_aspm_ctrl (priv,0 );return 0 ;
drivers/misc/habanalabs/habanalabs_drv.c +2 -4
@@ -295,8 +295,7 @@ void destroy_hdev(struct hl_device *hdev)static int hl_pmops_suspend (struct device *dev) { -struct pci_dev *pdev =to_pci_dev (dev); -struct hl_device *hdev =pci_get_drvdata (pdev); +struct hl_device *hdev =dev_get_drvdata (dev);pr_debug ("Going to suspend PCI device\n" );
@@ -310,8 +309,7 @@ static int hl_pmops_suspend(struct device *dev)static int hl_pmops_resume (struct device *dev) { -struct pci_dev *pdev =to_pci_dev (dev); -struct hl_device *hdev =pci_get_drvdata (pdev); +struct hl_device *hdev =dev_get_drvdata (dev);pr_debug ("Going to resume PCI device\n" );
drivers/misc/mei/pci-me.c +8 -11
@@ -378,12 +378,11 @@ static int mei_me_pci_resume(struct device *device)#ifdef CONFIG_PM static int mei_me_pm_runtime_idle (struct device *device) { -struct pci_dev *pdev =to_pci_dev (device);struct mei_device *dev; -dev_dbg (&pdev->dev,"rpm: me: runtime_idle\n" ); +dev_dbg (device,"rpm: me: runtime_idle\n" ); - dev =pci_get_drvdata (pdev); + dev =dev_get_drvdata (device);if (!dev)return -ENODEV ;if (mei_write_is_idle (dev))
@@ -394,13 +393,12 @@ static int mei_me_pm_runtime_idle(struct device *device)static int mei_me_pm_runtime_suspend (struct device *device) { -struct pci_dev *pdev =to_pci_dev (device);struct mei_device *dev;int ret; -dev_dbg (&pdev->dev,"rpm: me: runtime suspend\n" ); +dev_dbg (device,"rpm: me: runtime suspend\n" ); - dev =pci_get_drvdata (pdev); + dev =dev_get_drvdata (device);if (!dev)return -ENODEV ;
@@ -413,7 +411,7 @@ static int mei_me_pm_runtime_suspend(struct device *device)mutex_unlock (&dev->device_lock); -dev_dbg (&pdev->dev,"rpm: me: runtime suspend ret=%d\n" , ret); +dev_dbg (device,"rpm: me: runtime suspend ret=%d\n" , ret);if (ret && ret != -EAGAIN )schedule_work (&dev->reset_work);
@@ -423,13 +421,12 @@ static int mei_me_pm_runtime_suspend(struct device *device)static int mei_me_pm_runtime_resume (struct device *device) { -struct pci_dev *pdev =to_pci_dev (device);struct mei_device *dev;int ret; -dev_dbg (&pdev->dev,"rpm: me: runtime resume\n" ); +dev_dbg (device,"rpm: me: runtime resume\n" ); - dev =pci_get_drvdata (pdev); + dev =dev_get_drvdata (device);if (!dev)return -ENODEV ;
@@ -439,7 +436,7 @@ static int mei_me_pm_runtime_resume(struct device *device)mutex_unlock (&dev->device_lock); -dev_dbg (&pdev->dev,"rpm: me: runtime resume ret = %d\n" , ret); +dev_dbg (device,"rpm: me: runtime resume ret = %d\n" , ret);if (ret)schedule_work (&dev->reset_work);
drivers/misc/mei/pci-txe.c +8 -11
@@ -276,12 +276,11 @@ static int mei_txe_pci_resume(struct device *device)#ifdef CONFIG_PM static int mei_txe_pm_runtime_idle (struct device *device) { -struct pci_dev *pdev =to_pci_dev (device);struct mei_device *dev; -dev_dbg (&pdev->dev,"rpm: txe: runtime_idle\n" ); +dev_dbg (device,"rpm: txe: runtime_idle\n" ); - dev =pci_get_drvdata (pdev); + dev =dev_get_drvdata (device);if (!dev)return -ENODEV ;if (mei_write_is_idle (dev))
@@ -291,13 +290,12 @@ static int mei_txe_pm_runtime_idle(struct device *device) }static int mei_txe_pm_runtime_suspend (struct device *device) { -struct pci_dev *pdev =to_pci_dev (device);struct mei_device *dev;int ret; -dev_dbg (&pdev->dev,"rpm: txe: runtime suspend\n" ); +dev_dbg (device,"rpm: txe: runtime suspend\n" ); - dev =pci_get_drvdata (pdev); + dev =dev_get_drvdata (device);if (!dev)return -ENODEV ;
@@ -310,7 +308,7 @@ static int mei_txe_pm_runtime_suspend(struct device *device)/* keep irq on we are staying in D0 */ -dev_dbg (&pdev->dev,"rpm: txe: runtime suspend ret=%d\n" , ret); +dev_dbg (device,"rpm: txe: runtime suspend ret=%d\n" , ret);mutex_unlock (&dev->device_lock);
@@ -322,13 +320,12 @@ static int mei_txe_pm_runtime_suspend(struct device *device)static int mei_txe_pm_runtime_resume (struct device *device) { -struct pci_dev *pdev =to_pci_dev (device);struct mei_device *dev;int ret; -dev_dbg (&pdev->dev,"rpm: txe: runtime resume\n" ); +dev_dbg (device,"rpm: txe: runtime resume\n" ); - dev =pci_get_drvdata (pdev); + dev =dev_get_drvdata (device);if (!dev)return -ENODEV ;
@@ -340,7 +337,7 @@ static int mei_txe_pm_runtime_resume(struct device *device)mutex_unlock (&dev->device_lock); -dev_dbg (&pdev->dev,"rpm: txe: runtime resume ret = %d\n" , ret); +dev_dbg (device,"rpm: txe: runtime resume ret = %d\n" , ret);if (ret)schedule_work (&dev->reset_work);
Signature · 1 line
2.20.1
Greg Kroah-Hartman
maintainerQuoted 10 lines · Chuhong Yuan
Instead of using
to_pci_dev+pci_get_drvdata,
usedev_get_drvdatato make code simpler.Signed-off-by Chuhong Yuan <[email protected]>--- drivers/misc/cardreader/alcor_pci.c | 6 ++---- drivers/misc/habanalabs/habanalabs_drv.c | 6 ++---- drivers/misc/mei/pci-me.c | 19 ++++++++----------- drivers/misc/mei/pci-txe.c | 19 ++++++++----------- 4 files changed, 20 insertions(+), 30 deletions(-)
Please break this up into one-patch-per driver so that they can go through the various different maintainers of them.
thanks,
greg k-h