system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

net/irda/sh_irda: Modify clk_get lookups

Browse source 
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Kuninori Morimoto 2010-06-08 06:25:17 +00:00 committed by Paul Mundt
parent 6e86ccad15
commit 8a2b6beffc
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-shmobile/board-g3evm.c
View file

@ -232,6 +232,7 @@ static struct resource irda_resources[] = {
static struct platform_device irda_device = {
.name = "sh_irda",
.id = -1,
.resource = irda_resources,
.num_resources = ARRAY_SIZE(irda_resources),
};

6
drivers/net/irda/sh_irda.c
View file

@ -748,7 +748,6 @@ static int __devinit sh_irda_probe(struct platform_device *pdev)
struct net_device *ndev;
struct sh_irda_self *self;
struct resource *res;
char clk_name[8];
unsigned int irq;
int err = -ENOMEM;
@ -775,10 +774,9 @@ static int __devinit sh_irda_probe(struct platform_device *pdev)
if (err)
goto err_mem_2;
snprintf(clk_name, sizeof(clk_name), "irda%d", pdev->id);
self->clk = clk_get(&pdev->dev, clk_name);
self->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(self->clk)) {
dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name);
dev_err(&pdev->dev, "cannot get irda clock\n");
goto err_mem_3;
}