aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2010-06-08 06:25:17 +0000
committerPaul Mundt <lethal@linux-sh.org>2010-08-04 15:51:35 +0900
commit8a2b6beffc88b83089845d72eed2ed74eb5c9b1e (patch)
tree502780ddd8d8013b035ca83bcaec6b2e4032edd9 /drivers/net
parent6e86ccad15c01e2239da9a76cfbfbf41bbe332ba (diff)
downloadkernel_samsung_tuna-8a2b6beffc88b83089845d72eed2ed74eb5c9b1e.zip
kernel_samsung_tuna-8a2b6beffc88b83089845d72eed2ed74eb5c9b1e.tar.gz
kernel_samsung_tuna-8a2b6beffc88b83089845d72eed2ed74eb5c9b1e.tar.bz2
net/irda/sh_irda: Modify clk_get lookups
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/irda/sh_irda.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/irda/sh_irda.c b/drivers/net/irda/sh_irda.c
index 9a828b0..9db7084 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;
}