Rename mxt_object_show() to object_show(), so that object attr can also use DEVICE_ATTR_[RO|WO] to align with other attrs. Signed-off-by: Jiada Wang <jiada_wang@xxxxxxxxxx> --- drivers/input/touchscreen/atmel_mxt_ts.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 780850343089..c3dd6c486c12 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -3171,8 +3171,8 @@ static ssize_t mxt_show_instance(char *buf, int count, return count; } -static ssize_t mxt_object_show(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t object_show(struct device *dev, + struct device_attribute *attr, char *buf) { struct mxt_data *data = dev_get_drvdata(dev); struct mxt_object *object; @@ -3484,7 +3484,7 @@ static const struct attribute_group mxt_fw_attr_group = { static DEVICE_ATTR_RO(fw_version); static DEVICE_ATTR_RO(hw_version); -static DEVICE_ATTR(object, S_IRUGO, mxt_object_show, NULL); +static DEVICE_ATTR_RO(object); static DEVICE_ATTR_WO(update_cfg); static DEVICE_ATTR_RO(config_crc); -- 2.17.1