2019-07-23 22:20:40

by Chuhong Yuan

Subject: [PATCH] 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(-)

diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
index 2932f421b3ea..dd3a1f3dcc19 100644
--- a/drivers/memstick/host/r592.c
+++ b/drivers/memstick/host/r592.c
@@ -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

2019-07-24 16:28:27

by Ulf Hansson

Subject: Re: [PATCH] memstick: r592: Use dev_get_drvdata

On Tue, 23 Jul 2019 at 13:50, Chuhong Yuan <[email protected]> wrote:
>
> Instead of using to_pci_dev + pci_get_drvdata,
> use dev_get_drvdata to make code simpler.
>
> Signed-off-by: Chuhong Yuan <[email protected]>

Applied for next, thanks!

Kind regards
Uffe

> ---
> drivers/memstick/host/r592.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
> index 2932f421b3ea..dd3a1f3dcc19 100644
> --- a/drivers/memstick/host/r592.c
> +++ b/drivers/memstick/host/r592.c
> @@ -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
>