|
@@ -904,17 +904,13 @@ static ssize_t mxt_object_show(struct device *dev,
|
|
|
for (i = 0; i < data->info.object_num; i++) {
|
|
|
object = data->object_table + i;
|
|
|
|
|
|
- count += snprintf(buf + count, PAGE_SIZE - count,
|
|
|
+ count += scnprintf(buf + count, PAGE_SIZE - count,
|
|
|
"Object[%d] (Type %d)\n",
|
|
|
i + 1, object->type);
|
|
|
- if (count >= PAGE_SIZE)
|
|
|
- return PAGE_SIZE - 1;
|
|
|
|
|
|
if (!mxt_object_readable(object->type)) {
|
|
|
- count += snprintf(buf + count, PAGE_SIZE - count,
|
|
|
+ count += scnprintf(buf + count, PAGE_SIZE - count,
|
|
|
"\n");
|
|
|
- if (count >= PAGE_SIZE)
|
|
|
- return PAGE_SIZE - 1;
|
|
|
continue;
|
|
|
}
|
|
|
|
|
@@ -924,15 +920,11 @@ static ssize_t mxt_object_show(struct device *dev,
|
|
|
if (error)
|
|
|
return error;
|
|
|
|
|
|
- count += snprintf(buf + count, PAGE_SIZE - count,
|
|
|
+ count += scnprintf(buf + count, PAGE_SIZE - count,
|
|
|
"\t[%2d]: %02x (%d)\n", j, val, val);
|
|
|
- if (count >= PAGE_SIZE)
|
|
|
- return PAGE_SIZE - 1;
|
|
|
}
|
|
|
|
|
|
- count += snprintf(buf + count, PAGE_SIZE - count, "\n");
|
|
|
- if (count >= PAGE_SIZE)
|
|
|
- return PAGE_SIZE - 1;
|
|
|
+ count += scnprintf(buf + count, PAGE_SIZE - count, "\n");
|
|
|
}
|
|
|
|
|
|
return count;
|