linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/4] usb: r8a66597-hcd: use platform_{get,set}_drvdata()
@ 2013-08-27  8:10 Libo Chen
  2013-08-28  4:36 ` Greg KH
  0 siblings, 1 reply; 6+ messages in thread
From: Libo Chen @ 2013-08-27  8:10 UTC (permalink / raw)
  To: Greg KH; +Cc: balbi, stern, USB, LKML, Li Zefan


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 <libo.chen@huawei.com>
---
 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


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/4] usb: r8a66597-hcd: use platform_{get,set}_drvdata()
  2013-08-27  8:10 [PATCH 2/4] usb: r8a66597-hcd: use platform_{get,set}_drvdata() Libo Chen
@ 2013-08-28  4:36 ` Greg KH
  2013-08-28  6:12   ` Libo Chen
                     ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Greg KH @ 2013-08-28  4:36 UTC (permalink / raw)
  To: Libo Chen; +Cc: balbi, stern, USB, LKML, Li Zefan

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 <libo.chen@huawei.com>
> ---
>  drivers/usb/host/r8a66597-hcd.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

This patch doesn't apply to my tree :(


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/4] usb: r8a66597-hcd: use platform_{get,set}_drvdata()
  2013-08-28  4:36 ` Greg KH
@ 2013-08-28  6:12   ` Libo Chen
  2013-08-29  2:54   ` Libo Chen
  2013-08-30  3:23   ` [PATCH RESEND " Libo Chen
  2 siblings, 0 replies; 6+ messages in thread
From: Libo Chen @ 2013-08-28  6:12 UTC (permalink / raw)
  To: Greg KH; +Cc: balbi, stern, USB, LKML, Li Zefan

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 <libo.chen@huawei.com>
>> ---
>>  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

> 
> 
> 



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/4] usb: r8a66597-hcd: use platform_{get,set}_drvdata()
  2013-08-28  4:36 ` Greg KH
  2013-08-28  6:12   ` Libo Chen
@ 2013-08-29  2:54   ` Libo Chen
  2013-08-29  6:32     ` Greg KH
  2013-08-30  3:23   ` [PATCH RESEND " Libo Chen
  2 siblings, 1 reply; 6+ messages in thread
From: Libo Chen @ 2013-08-29  2:54 UTC (permalink / raw)
  To: Greg KH; +Cc: balbi, stern, USB, LKML

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 <libo.chen@huawei.com>
>> ---
>>  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"?


> 
> 
> 



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/4] usb: r8a66597-hcd: use platform_{get,set}_drvdata()
  2013-08-29  2:54   ` Libo Chen
@ 2013-08-29  6:32     ` Greg KH
  0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2013-08-29  6:32 UTC (permalink / raw)
  To: Libo Chen; +Cc: balbi, stern, USB, LKML

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 <libo.chen@huawei.com>
> >> ---
> >>  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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH RESEND 2/4] usb: r8a66597-hcd: use platform_{get,set}_drvdata()
  2013-08-28  4:36 ` Greg KH
  2013-08-28  6:12   ` Libo Chen
  2013-08-29  2:54   ` Libo Chen
@ 2013-08-30  3:23   ` Libo Chen
  2 siblings, 0 replies; 6+ messages in thread
From: Libo Chen @ 2013-08-30  3:23 UTC (permalink / raw)
  To: Greg KH; +Cc: balbi, stern, USB, LKML, Li Zefan


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 <libo.chen@huawei.com>
---
 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



^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2013-08-30  3:23 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-27  8:10 [PATCH 2/4] usb: r8a66597-hcd: use platform_{get,set}_drvdata() Libo Chen
2013-08-28  4:36 ` Greg KH
2013-08-28  6:12   ` Libo Chen
2013-08-29  2:54   ` Libo Chen
2013-08-29  6:32     ` Greg KH
2013-08-30  3:23   ` [PATCH RESEND " Libo Chen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).