memstick: r592: Use dev_get_drvdata
Subsystems (3)
PATCH 1/1 memstick: r592: Use dev_get_drvdata
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/memstick/host/r592.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/memstick/host/r592.c +2 -4
@@ -847,8 +847,7 @@ static void r592_remove(struct pci_dev *pdev)#ifdef CONFIG_PM_SLEEP static int r592_suspend (struct device *core_dev) { -struct pci_dev *pdev =to_pci_dev (core_dev); -struct r592_device *dev =pci_get_drvdata (pdev); +struct r592_device *dev =dev_get_drvdata (core_dev);r592_clear_interrupts (dev);memstick_suspend_host (dev->host);
@@ -858,8 +857,7 @@ static int r592_suspend(struct device *core_dev)static int r592_resume (struct device *core_dev) { -struct pci_dev *pdev =to_pci_dev (core_dev); -struct r592_device *dev =pci_get_drvdata (pdev); +struct r592_device *dev =dev_get_drvdata (core_dev);r592_clear_interrupts (dev);r592_enable_device (dev, false);
Signature · 1 line
2.20.1
Quoted 5 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]>
Applied for next, thanks!
Kind regards
Uffe
Quoted 31 lines
--- drivers/memstick/host/r592.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)drivers/memstick/host/r592.c +2
-5@@ -847,8 +847,7 @@ static void r592_remove(struct pci_dev *pdev)#ifdef CONFIG_PM_SLEEP static int r592_suspend (struct device *core_dev) { -struct pci_dev *pdev =to_pci_dev (core_dev); -struct r592_device *dev =pci_get_drvdata (pdev); +struct r592_device *dev =dev_get_drvdata (core_dev);r592_clear_interrupts (dev);memstick_suspend_host (dev->host);@@ -858,8 +857,7 @@ static int r592_suspend(struct device *core_dev)static int r592_resume (struct device *core_dev) { -struct pci_dev *pdev =to_pci_dev (core_dev); -struct r592_device *dev =pci_get_drvdata (pdev); +struct r592_device *dev =dev_get_drvdata (core_dev);r592_clear_interrupts (dev);r592_enable_device (dev, false); --2.20.1