cpufreq: Drop unnecessary checks from show() and store() (6541aef0) · Commits · 戴 / test

The show() and store() routines in the cpufreq core don't need to check if the struct freq_attr they want to use really provides the callbacks they need as expected (if that's not the case, it means a bug in the code anyway), so change them to avoid doing that. Signed-off-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by:

Viresh Kumar <viresh.kumar@linaro.org>

drivers/cpufreq/cpufreq.c

+5 −16

Original line number	Diff line number	Diff line
		@@ -818,12 +818,7 @@ static ssize_t show(struct kobject kobj, struct attribute attr, char *buf)
		ssize_t ret;

		down_read(&policy->rwsem);

		if (fattr->show)
		ret = fattr->show(policy, buf);
		else
		ret = -EIO;

		up_read(&policy->rwsem);

		return ret;
		@@ -838,18 +833,12 @@ static ssize_t store(struct kobject kobj, struct attribute attr,

		get_online_cpus();

		if (!cpu_online(policy->cpu))
		goto unlock;

		if (cpu_online(policy->cpu)) {
		down_write(&policy->rwsem);

		if (fattr->store)
		ret = fattr->store(policy, buf, count);
		else
		ret = -EIO;

		up_write(&policy->rwsem);
		unlock:
		}

		put_online_cpus();

		return ret;

Admin message