OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clocksource: sh_mtu2: Rename struct sh_mtu2_priv to sh_mtu2_device 

Channel data is private as well, rename priv to device to make the
distrinction between the core device and the channels clearer.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Wolfram Sang <wsa@sang-engineering.com>
This commit is contained in:
Laurent Pinchart 2014-03-04 13:04:48 +01:00
parent 42752cc619
commit 7dad72de1b
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
drivers/clocksource/sh_mtu2.c
View File

@ -34,15 +34,15 @@
#include <linux/pm_domain.h> #include <linux/pm_domain.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
struct sh_mtu2_priv; struct sh_mtu2_device;
struct sh_mtu2_channel { struct sh_mtu2_channel {
struct sh_mtu2_priv *mtu; struct sh_mtu2_device *mtu;
int irq; int irq;
struct clock_event_device ced; struct clock_event_device ced;
}; };
struct sh_mtu2_priv { struct sh_mtu2_device {
struct platform_device *pdev; struct platform_device *pdev;
void __iomem *mapbase; void __iomem *mapbase;
@ -273,75 +273,76 @@ static int sh_mtu2_register(struct sh_mtu2_channel *ch, char *name,
return 0; return 0;
} }
static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev) static int sh_mtu2_setup(struct sh_mtu2_device *mtu,
struct platform_device *pdev)
{ {
struct sh_timer_config *cfg = pdev->dev.platform_data; struct sh_timer_config *cfg = pdev->dev.platform_data;
struct resource *res; struct resource *res;
int ret; int ret;
ret = -ENXIO; ret = -ENXIO;
memset(p, 0, sizeof(*p)); memset(mtu, 0, sizeof(*mtu));
p->pdev = pdev; mtu->pdev = pdev;
if (!cfg) { if (!cfg) {
dev_err(&p->pdev->dev, "missing platform data\n"); dev_err(&mtu->pdev->dev, "missing platform data\n");
goto err0; goto err0;
} }
platform_set_drvdata(pdev, p); platform_set_drvdata(pdev, mtu);
res = platform_get_resource(p->pdev, IORESOURCE_MEM, 0); res = platform_get_resource(mtu->pdev, IORESOURCE_MEM, 0);
if (!res) { if (!res) {
dev_err(&p->pdev->dev, "failed to get I/O memory\n"); dev_err(&mtu->pdev->dev, "failed to get I/O memory\n");
goto err0; goto err0;
} }
p->channel.irq = platform_get_irq(p->pdev, 0); mtu->channel.irq = platform_get_irq(mtu->pdev, 0);
if (p->channel.irq < 0) { if (mtu->channel.irq < 0) {
dev_err(&p->pdev->dev, "failed to get irq\n"); dev_err(&mtu->pdev->dev, "failed to get irq\n");
goto err0; goto err0;
} }
/* map memory, let mapbase point to our channel */ /* map memory, let mapbase point to our channel */
p->mapbase = ioremap_nocache(res->start, resource_size(res)); mtu->mapbase = ioremap_nocache(res->start, resource_size(res));
if (p->mapbase == NULL) { if (mtu->mapbase == NULL) {
dev_err(&p->pdev->dev, "failed to remap I/O memory\n"); dev_err(&mtu->pdev->dev, "failed to remap I/O memory\n");
goto err0; goto err0;
} }
/* get hold of clock */ /* get hold of clock */
p->clk = clk_get(&p->pdev->dev, "mtu2_fck"); mtu->clk = clk_get(&mtu->pdev->dev, "mtu2_fck");
if (IS_ERR(p->clk)) { if (IS_ERR(mtu->clk)) {
dev_err(&p->pdev->dev, "cannot get clock\n"); dev_err(&mtu->pdev->dev, "cannot get clock\n");
ret = PTR_ERR(p->clk); ret = PTR_ERR(mtu->clk);
goto err1; goto err1;
} }
ret = clk_prepare(p->clk); ret = clk_prepare(mtu->clk);
if (ret < 0) if (ret < 0)
goto err2; goto err2;
p->channel.mtu = p; mtu->channel.mtu = mtu;
ret = sh_mtu2_register(&p->channel, (char *)dev_name(&p->pdev->dev), ret = sh_mtu2_register(&mtu->channel, (char *)dev_name(&mtu->pdev->dev),
cfg->clockevent_rating); cfg->clockevent_rating);
if (ret < 0) if (ret < 0)
goto err3; goto err3;
return 0; return 0;
err3: err3:
clk_unprepare(p->clk); clk_unprepare(mtu->clk);
err2: err2:
clk_put(p->clk); clk_put(mtu->clk);
err1: err1:
iounmap(p->mapbase); iounmap(mtu->mapbase);
err0: err0:
return ret; return ret;
} }
static int sh_mtu2_probe(struct platform_device *pdev) static int sh_mtu2_probe(struct platform_device *pdev)
{ {
struct sh_mtu2_priv *p = platform_get_drvdata(pdev); struct sh_mtu2_device *mtu = platform_get_drvdata(pdev);
struct sh_timer_config *cfg = pdev->dev.platform_data; struct sh_timer_config *cfg = pdev->dev.platform_data;
int ret; int ret;
@ -350,20 +351,20 @@ static int sh_mtu2_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
} }
if (p) { if (mtu) {
dev_info(&pdev->dev, "kept as earlytimer\n"); dev_info(&pdev->dev, "kept as earlytimer\n");
goto out; goto out;
} }
p = kmalloc(sizeof(*p), GFP_KERNEL); mtu = kmalloc(sizeof(*mtu), GFP_KERNEL);
if (p == NULL) { if (mtu == NULL) {
dev_err(&pdev->dev, "failed to allocate driver data\n"); dev_err(&pdev->dev, "failed to allocate driver data\n");
return -ENOMEM; return -ENOMEM;
} }
ret = sh_mtu2_setup(p, pdev); ret = sh_mtu2_setup(mtu, pdev);
if (ret) { if (ret) {
kfree(p); kfree(mtu);
pm_runtime_idle(&pdev->dev); pm_runtime_idle(&pdev->dev);
return ret; return ret;
} }