From: Kuninori Morimoto Date: Tue, 8 Jun 2010 06:25:17 +0000 (+0000) Subject: net/irda/sh_irda: Modify clk_get lookups X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8a2b6beffc88b83089845d72eed2ed74eb5c9b1e;p=linux-beck.git net/irda/sh_irda: Modify clk_get lookups Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt --- diff --git a/arch/arm/mach-shmobile/board-g3evm.c b/arch/arm/mach-shmobile/board-g3evm.c index 95ccb949d5d9..a5525901e91f 100644 --- a/arch/arm/mach-shmobile/board-g3evm.c +++ b/arch/arm/mach-shmobile/board-g3evm.c @@ -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), }; diff --git a/drivers/net/irda/sh_irda.c b/drivers/net/irda/sh_irda.c index 9a828b06a57e..9db7084bc001 100644 --- a/drivers/net/irda/sh_irda.c +++ b/drivers/net/irda/sh_irda.c @@ -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; }