2013-08-27 08:11:17

by Libo Chen

Subject: [PATCH 2/4] usb: r8a66597-hcd: use platform_{get,set}_drvdata()

Use the wrapper functions for getting and setting the driver data using
platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
so we can directly pass a struct platform_device.

Signed-off-by: Libo Chen <[email protected]>
---
drivers/usb/host/r8a66597-hcd.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index a6fd8f5..777790a 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -2393,7 +2393,7 @@ static const struct dev_pm_ops r8a66597_dev_pm_ops = {

static int r8a66597_remove(struct platform_device *pdev)
{
- struct r8a66597 *r8a66597 = dev_get_drvdata(&pdev->dev);
+ struct r8a66597 *r8a66597 = platform_get_drvdata(pdev);
struct usb_hcd *hcd = r8a66597_to_hcd(r8a66597);

del_timer_sync(&r8a66597->rh_timer);
@@ -2466,7 +2466,7 @@ static int r8a66597_probe(struct platform_device *pdev)
}
r8a66597 = hcd_to_r8a66597(hcd);
memset(r8a66597, 0, sizeof(struct r8a66597));
- dev_set_drvdata(&pdev->dev, r8a66597);
+ platform_set_drvdata(pdev, r8a66597);
r8a66597->pdata = pdev->dev.platform_data;
r8a66597->irq_sense_low = irq_trigger == IRQF_TRIGGER_LOW;

--
1.7.1

2013-08-28 04:33:50

by Greg Kroah-Hartman

Subject: Re: [PATCH 2/4] usb: r8a66597-hcd: use platform_{get,set}_drvdata()

On Tue, Aug 27, 2013 at 04:10:22PM +0800, Libo Chen wrote:
>
> Use the wrapper functions for getting and setting the driver data using
> platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
> so we can directly pass a struct platform_device.
>
> Signed-off-by: Libo Chen <[email protected]>
> ---
> drivers/usb/host/r8a66597-hcd.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)

This patch doesn't apply to my tree :(

2013-08-28 06:13:00

by Libo Chen

Subject: Re: [PATCH 2/4] usb: r8a66597-hcd: use platform_{get,set}_drvdata()

On 2013/8/28 12:36, Greg KH wrote:
> On Tue, Aug 27, 2013 at 04:10:22PM +0800, Libo Chen wrote:
>>
>> Use the wrapper functions for getting and setting the driver data using
>> platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
>> so we can directly pass a struct platform_device.
>>
>> Signed-off-by: Libo Chen <[email protected]>
>> ---
>> drivers/usb/host/r8a66597-hcd.c | 4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> This patch doesn't apply to my tree :(

ok, I will rebase on usb-tree later.

Thanks,
Libo

>
>
>

2013-08-29 02:55:54

by Libo Chen

Subject: Re: [PATCH 2/4] usb: r8a66597-hcd: use platform_{get,set}_drvdata()

On 2013/8/28 12:36, Greg KH wrote:
> On Tue, Aug 27, 2013 at 04:10:22PM +0800, Libo Chen wrote:
>>
>> Use the wrapper functions for getting and setting the driver data using
>> platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
>> so we can directly pass a struct platform_device.
>>
>> Signed-off-by: Libo Chen <[email protected]>
>> ---
>> drivers/usb/host/r8a66597-hcd.c | 4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> This patch doesn't apply to my tree :(

Hi Greg,

This patch based on mainline.
Do you mean this patch got a conflicted in "git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git"

I need to rebase on "usb.git"?


>
>
>

2013-08-29 06:30:31

by Greg Kroah-Hartman

Subject: Re: [PATCH 2/4] usb: r8a66597-hcd: use platform_{get,set}_drvdata()

On Thu, Aug 29, 2013 at 10:54:51AM +0800, Libo Chen wrote:
> On 2013/8/28 12:36, Greg KH wrote:
> > On Tue, Aug 27, 2013 at 04:10:22PM +0800, Libo Chen wrote:
> >>
> >> Use the wrapper functions for getting and setting the driver data using
> >> platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
> >> so we can directly pass a struct platform_device.
> >>
> >> Signed-off-by: Libo Chen <[email protected]>
> >> ---
> >> drivers/usb/host/r8a66597-hcd.c | 4 ++--
> >> 1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > This patch doesn't apply to my tree :(
>
> Hi Greg,
>
> This patch based on mainline.
> Do you mean this patch got a conflicted in "git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git"
>
> I need to rebase on "usb.git"?

Yes, please use the usb-next branch.

thanks,

greg k-h

2013-08-30 03:23:57

by Libo Chen

Subject: [PATCH RESEND 2/4] usb: r8a66597-hcd: use platform_{get,set}_drvdata()

Use the wrapper functions for getting and setting the driver data using
platform_device instead of using dev_{get,set}_drvdata() with &of->dev,
so we can directly pass a struct platform_device.

Signed-off-by: Libo Chen <[email protected]>
---
drivers/usb/host/r8a66597-hcd.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

rebase on usb-next tree

diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index a9eef68..2ad004a 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -2393,7 +2393,7 @@ static const struct dev_pm_ops r8a66597_dev_pm_ops = {

static int r8a66597_remove(struct platform_device *pdev)
{
- struct r8a66597 *r8a66597 = dev_get_drvdata(&pdev->dev);
+ struct r8a66597 *r8a66597 = platform_get_drvdata(pdev);
struct usb_hcd *hcd = r8a66597_to_hcd(r8a66597);

del_timer_sync(&r8a66597->rh_timer);
@@ -2466,7 +2466,7 @@ static int r8a66597_probe(struct platform_device *pdev)
}
r8a66597 = hcd_to_r8a66597(hcd);
memset(r8a66597, 0, sizeof(struct r8a66597));
- dev_set_drvdata(&pdev->dev, r8a66597);
+ platform_set_drvdata(pdev, r8a66597);
r8a66597->pdata = dev_get_platdata(&pdev->dev);
r8a66597->irq_sense_low = irq_trigger == IRQF_TRIGGER_LOW;

--
1.7.1