Commit 2e1a5326 authored by Laurent Pinchart's avatar Laurent Pinchart

clocksource: sh_mtu2: Split channel setup to separate function

Move the channel setup code from sh_mtu2_setup to a new
sh_mtu2_setup_channel function and call it from sh_mtu2_setup.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: default avatarWolfram Sang <wsa@sang-engineering.com>
parent 7dad72de
...@@ -273,6 +273,24 @@ static int sh_mtu2_register(struct sh_mtu2_channel *ch, char *name, ...@@ -273,6 +273,24 @@ static int sh_mtu2_register(struct sh_mtu2_channel *ch, char *name,
return 0; return 0;
} }
static int sh_mtu2_setup_channel(struct sh_mtu2_channel *ch,
struct sh_mtu2_device *mtu)
{
struct sh_timer_config *cfg = mtu->pdev->dev.platform_data;
memset(ch, 0, sizeof(*ch));
ch->mtu = mtu;
ch->irq = platform_get_irq(mtu->pdev, 0);
if (ch->irq < 0) {
dev_err(&mtu->pdev->dev, "failed to get irq\n");
return ch->irq;
}
return sh_mtu2_register(ch, (char *)dev_name(&mtu->pdev->dev),
cfg->clockevent_rating);
}
static int sh_mtu2_setup(struct sh_mtu2_device *mtu, static int sh_mtu2_setup(struct sh_mtu2_device *mtu,
struct platform_device *pdev) struct platform_device *pdev)
{ {
...@@ -297,12 +315,6 @@ static int sh_mtu2_setup(struct sh_mtu2_device *mtu, ...@@ -297,12 +315,6 @@ static int sh_mtu2_setup(struct sh_mtu2_device *mtu,
goto err0; goto err0;
} }
mtu->channel.irq = platform_get_irq(mtu->pdev, 0);
if (mtu->channel.irq < 0) {
dev_err(&mtu->pdev->dev, "failed to get irq\n");
goto err0;
}
/* map memory, let mapbase point to our channel */ /* map memory, let mapbase point to our channel */
mtu->mapbase = ioremap_nocache(res->start, resource_size(res)); mtu->mapbase = ioremap_nocache(res->start, resource_size(res));
if (mtu->mapbase == NULL) { if (mtu->mapbase == NULL) {
...@@ -322,10 +334,7 @@ static int sh_mtu2_setup(struct sh_mtu2_device *mtu, ...@@ -322,10 +334,7 @@ static int sh_mtu2_setup(struct sh_mtu2_device *mtu,
if (ret < 0) if (ret < 0)
goto err2; goto err2;
mtu->channel.mtu = mtu; ret = sh_mtu2_setup_channel(&mtu->channel, mtu);
ret = sh_mtu2_register(&mtu->channel, (char *)dev_name(&mtu->pdev->dev),
cfg->clockevent_rating);
if (ret < 0) if (ret < 0)
goto err3; goto err3;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment