|
@@ -147,19 +147,18 @@ static int bfin_rotary_probe(struct platform_device *pdev)
|
|
|
|
|
|
if (pdata->pin_list) {
|
|
if (pdata->pin_list) {
|
|
error = peripheral_request_list(pdata->pin_list,
|
|
error = peripheral_request_list(pdata->pin_list,
|
|
- dev_name(&pdev->dev));
|
|
|
|
|
|
+ dev_name(dev));
|
|
if (error) {
|
|
if (error) {
|
|
dev_err(dev, "requesting peripherals failed: %d\n",
|
|
dev_err(dev, "requesting peripherals failed: %d\n",
|
|
error);
|
|
error);
|
|
return error;
|
|
return error;
|
|
}
|
|
}
|
|
|
|
|
|
- error = devm_add_action(dev, bfin_rotary_free_action,
|
|
|
|
- pdata->pin_list);
|
|
|
|
|
|
+ error = devm_add_action_or_reset(dev, bfin_rotary_free_action,
|
|
|
|
+ pdata->pin_list);
|
|
if (error) {
|
|
if (error) {
|
|
dev_err(dev, "setting cleanup action failed: %d\n",
|
|
dev_err(dev, "setting cleanup action failed: %d\n",
|
|
error);
|
|
error);
|
|
- peripheral_free_list(pdata->pin_list);
|
|
|
|
return error;
|
|
return error;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -189,7 +188,7 @@ static int bfin_rotary_probe(struct platform_device *pdev)
|
|
|
|
|
|
input->name = pdev->name;
|
|
input->name = pdev->name;
|
|
input->phys = "bfin-rotary/input0";
|
|
input->phys = "bfin-rotary/input0";
|
|
- input->dev.parent = &pdev->dev;
|
|
|
|
|
|
+ input->dev.parent = dev;
|
|
|
|
|
|
input_set_drvdata(input, rotary);
|
|
input_set_drvdata(input, rotary);
|
|
|
|
|
|
@@ -239,7 +238,7 @@ static int bfin_rotary_probe(struct platform_device *pdev)
|
|
}
|
|
}
|
|
|
|
|
|
platform_set_drvdata(pdev, rotary);
|
|
platform_set_drvdata(pdev, rotary);
|
|
- device_init_wakeup(&pdev->dev, 1);
|
|
|
|
|
|
+ device_init_wakeup(dev, 1);
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|