Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 248754
b: refs/heads/master
c: 206dcc2
h: refs/heads/master
v: v3
  • Loading branch information
Kuninori Morimoto authored and Greg Kroah-Hartman committed Apr 30, 2011
1 parent a963157 commit f8486f5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f429ea3f3488e1a0683f6f9ce76b420b5ebd2d63
refs/heads/master: 206dcc2cfe15b6174f15293ae15a097ee03eb386
14 changes: 7 additions & 7 deletions trunk/drivers/usb/renesas_usbhs/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ void usbhs_bset(struct usbhs_priv *priv, u32 reg, u16 mask, u16 data)
usbhs_write(priv, reg, val);
}

struct usbhs_priv *usbhs_pdev_to_priv(struct platform_device *pdev)
{
return dev_get_drvdata(&pdev->dev);
}

/*
* syscfg functions
*/
Expand Down Expand Up @@ -113,11 +118,6 @@ int usbhs_frame_get_num(struct usbhs_priv *priv)
/*
* local functions
*/
static struct usbhs_priv *usbhsc_pdev_to_priv(struct platform_device *pdev)
{
return dev_get_drvdata(&pdev->dev);
}

static void usbhsc_bus_ctrl(struct usbhs_priv *priv, int enable)
{
int wait = usbhs_get_dparam(priv, buswait_bwait);
Expand Down Expand Up @@ -210,7 +210,7 @@ static void usbhsc_notify_hotplug(struct work_struct *work)

static int usbhsc_drvcllbck_notify_hotplug(struct platform_device *pdev)
{
struct usbhs_priv *priv = usbhsc_pdev_to_priv(pdev);
struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);

/*
* This functions will be called in interrupt.
Expand Down Expand Up @@ -351,7 +351,7 @@ static int __devinit usbhs_probe(struct platform_device *pdev)

static int __devexit usbhs_remove(struct platform_device *pdev)
{
struct usbhs_priv *priv = usbhsc_pdev_to_priv(pdev);
struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
struct renesas_usbhs_platform_info *info = pdev->dev.platform_data;
struct renesas_usbhs_driver_callback *dfunc = &info->driver_callback;

Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/usb/renesas_usbhs/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ int usbhs_frame_get_num(struct usbhs_priv *priv);
/*
* data
*/
struct usbhs_priv *usbhs_pdev_to_priv(struct platform_device *pdev);
#define usbhs_get_dparam(priv, param) (priv->dparam->param)
#define usbhs_priv_to_pdev(priv) (priv->pdev)
#define usbhs_priv_to_dev(priv) (&priv->pdev->dev)
Expand Down

0 comments on commit f8486f5

Please sign in to comment.