|
@@ -593,14 +593,14 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
|
|
|
dev_err(dev, "Unable to match OF ID\n");
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
- axp20x->variant = (long) of_id->data;
|
|
|
+ axp20x->variant = (long)of_id->data;
|
|
|
} else {
|
|
|
acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
|
|
|
if (!acpi_id || !acpi_id->driver_data) {
|
|
|
dev_err(dev, "Unable to match ACPI ID and data\n");
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
- axp20x->variant = (long) acpi_id->driver_data;
|
|
|
+ axp20x->variant = (long)acpi_id->driver_data;
|
|
|
}
|
|
|
|
|
|
switch (axp20x->variant) {
|
|
@@ -634,7 +634,7 @@ int axp20x_match_device(struct axp20x_dev *axp20x)
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
dev_info(dev, "AXP20x variant %s found\n",
|
|
|
- axp20x_model_names[axp20x->variant]);
|
|
|
+ axp20x_model_names[axp20x->variant]);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -654,7 +654,7 @@ int axp20x_device_probe(struct axp20x_dev *axp20x)
|
|
|
}
|
|
|
|
|
|
ret = mfd_add_devices(axp20x->dev, -1, axp20x->cells,
|
|
|
- axp20x->nr_cells, NULL, 0, NULL);
|
|
|
+ axp20x->nr_cells, NULL, 0, NULL);
|
|
|
|
|
|
if (ret) {
|
|
|
dev_err(axp20x->dev, "failed to add MFD devices: %d\n", ret);
|