|
@@ -95,7 +95,7 @@ static int tps6521x_pb_probe(struct platform_device *pdev)
|
|
int error;
|
|
int error;
|
|
int irq;
|
|
int irq;
|
|
|
|
|
|
- match = of_match_node(of_tps6521x_pb_match, pdev->dev.of_node);
|
|
|
|
|
|
+ match = of_match_node(of_tps6521x_pb_match, dev->of_node);
|
|
if (!match)
|
|
if (!match)
|
|
return -ENXIO;
|
|
return -ENXIO;
|
|
|
|
|
|
@@ -118,10 +118,9 @@ static int tps6521x_pb_probe(struct platform_device *pdev)
|
|
|
|
|
|
input_set_capability(idev, EV_KEY, KEY_POWER);
|
|
input_set_capability(idev, EV_KEY, KEY_POWER);
|
|
|
|
|
|
- pwr->regmap = dev_get_regmap(pdev->dev.parent, NULL);
|
|
|
|
|
|
+ pwr->regmap = dev_get_regmap(dev->parent, NULL);
|
|
pwr->dev = dev;
|
|
pwr->dev = dev;
|
|
pwr->idev = idev;
|
|
pwr->idev = idev;
|
|
- platform_set_drvdata(pdev, pwr);
|
|
|
|
device_init_wakeup(dev, true);
|
|
device_init_wakeup(dev, true);
|
|
|
|
|
|
irq = platform_get_irq(pdev, 0);
|
|
irq = platform_get_irq(pdev, 0);
|
|
@@ -136,8 +135,7 @@ static int tps6521x_pb_probe(struct platform_device *pdev)
|
|
IRQF_ONESHOT,
|
|
IRQF_ONESHOT,
|
|
pwr->data->name, pwr);
|
|
pwr->data->name, pwr);
|
|
if (error) {
|
|
if (error) {
|
|
- dev_err(dev, "failed to request IRQ #%d: %d\n",
|
|
|
|
- irq, error);
|
|
|
|
|
|
+ dev_err(dev, "failed to request IRQ #%d: %d\n", irq, error);
|
|
return error;
|
|
return error;
|
|
}
|
|
}
|
|
|
|
|