static int __init r8a66597_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
        char clk_name[8];
        struct resource *res, *ires;
        int irq;
 
        if (irq < 0) {
                ret = -ENODEV;
-               dev_err(&pdev->dev, "platform_get_irq error.\n");
+               dev_err(dev, "platform_get_irq error.\n");
                goto clean_up;
        }
 
 
        spin_lock_init(&r8a66597->lock);
        platform_set_drvdata(pdev, r8a66597);
-       r8a66597->pdata = dev_get_platdata(&pdev->dev);
+       r8a66597->pdata = dev_get_platdata(dev);
        r8a66597->irq_sense_low = irq_trigger == IRQF_TRIGGER_LOW;
 
        r8a66597->gadget.ops = &r8a66597_gadget_ops;
 
        if (r8a66597->pdata->on_chip) {
                snprintf(clk_name, sizeof(clk_name), "usb%d", pdev->id);
-               r8a66597->clk = clk_get(&pdev->dev, clk_name);
+               r8a66597->clk = clk_get(dev, clk_name);
                if (IS_ERR(r8a66597->clk)) {
-                       dev_err(&pdev->dev, "cannot get clock \"%s\"\n",
-                               clk_name);
+                       dev_err(dev, "cannot get clock \"%s\"\n", clk_name);
                        ret = PTR_ERR(r8a66597->clk);
                        goto clean_up;
                }
        ret = request_irq(irq, r8a66597_irq, IRQF_SHARED,
                        udc_name, r8a66597);
        if (ret < 0) {
-               dev_err(&pdev->dev, "request_irq error (%d)\n", ret);
+               dev_err(dev, "request_irq error (%d)\n", ret);
                goto clean_up2;
        }
 
        }
        r8a66597->ep0_req->complete = nop_completion;
 
-       ret = usb_add_gadget_udc(&pdev->dev, &r8a66597->gadget);
+       ret = usb_add_gadget_udc(dev, &r8a66597->gadget);
        if (ret)
                goto err_add_udc;
 
-       dev_info(&pdev->dev, "version %s\n", DRIVER_VERSION);
+       dev_info(dev, "version %s\n", DRIVER_VERSION);
        return 0;
 
 err_add_udc: