2 files changed, 3 insertions, 4 deletions

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;
         }