Revert "PM / devfreq: Add show_one macro to delete the duplicate code" (1051e2c3) · Commits · 戴 / test

This reverts commit . The {min|max}_freq_show() show the stored value of the struct devfreq. But, if the drivers/thermal/devfreq_cooling.c disables the specific frequency value, {min|max}_freq_show() have to check this situation before showing the stored value. So, this patch revert the macro in order to add the additional codes. Signed-off-by:

Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by:

MyungJoo Ham <myungjoo.ham@samsung.com>

drivers/devfreq/devfreq.c

+11 −9

Original line number	Diff line number	Diff line
		@@ -1124,6 +1124,12 @@ unlock:
		return ret;
		}

		static ssize_t min_freq_show(struct device dev, struct device_attribute attr,
		char *buf)
		{
		return sprintf(buf, "%lu\n", to_devfreq(dev)->min_freq);
		}

		static ssize_t max_freq_store(struct device dev, struct device_attribute attr,
		const char *buf, size_t count)
		{
		@@ -1150,17 +1156,13 @@ unlock:
		mutex_unlock(&df->lock);
		return ret;
		}
		static DEVICE_ATTR_RW(min_freq);

		#define show_one(name) \
		static ssize_t name##_show \
		(struct device dev, struct device_attribute attr, char *buf) \
		{ \
		return sprintf(buf, "%lu\n", to_devfreq(dev)->name); \
		static ssize_t max_freq_show(struct device dev, struct device_attribute attr,
		char *buf)
		{
		return sprintf(buf, "%lu\n", to_devfreq(dev)->max_freq);
		}
		show_one(min_freq);
		show_one(max_freq);

		static DEVICE_ATTR_RW(min_freq);
		static DEVICE_ATTR_RW(max_freq);

		static ssize_t available_frequencies_show(struct device *d,

Admin message