From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757059AbdJKDK4 (ORCPT ); Tue, 10 Oct 2017 23:10:56 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:64236 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755864AbdJKDJt (ORCPT ); Tue, 10 Oct 2017 23:09:49 -0400 X-AuditID: b6c32a37-c75ff70000001076-8f-59dd8b7a33dd From: Chanwoo Choi To: myungjoo.ham@samsung.com, kyungmin.park@samsung.com, cw00.choi@samsung.com Cc: rafael.j.wysocki@intel.com, chanwoo@kernel.org, inki.dae@samsung.com, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH v3 2/8] Revert "PM / devfreq: Add show_one macro to delete the duplicate code" Date: Wed, 11 Oct 2017 12:09:18 +0900 Message-id: <1507691364-3899-3-git-send-email-cw00.choi@samsung.com> X-Mailer: git-send-email 1.8.0 In-reply-to: <1507691364-3899-1-git-send-email-cw00.choi@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrJKsWRmVeSWpSXmKPExsWy7bCmgW5V991IgzfvrCwm3rjCYnH9y3NW i0n3J7BYnG16w25xedccNovPvUcYLW43rmCzeLziLbsDh8fiPS+ZPDat6mTz6NuyitHj8ya5 AJaoVJuM1MSU1CKF1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wcoDOU FMoSc0qBQgGJxcVK+nY2RfmlJakKGfnFJbZK0YaGRnqGBuZ6RkZGeibGsVZGpkAlCakZ699f Zyn4zVex79FZxgbGvTxdjJwcEgImEidm/WTvYuTiEBLYwSjx+sxLZgjnO6PE9J2n2GCq5n1v ZIFI7GaUuDvrHiuE84NRoqdlLjtIFZuAlsT+FzfAOkQEAiQ6165iAiliFmhilNh/7wZYkbBA gsSiqYeBdnBwsAioSvydUQAS5hVwkZi7/T07xDY5iQ97HoHZnAKuEpNnnQK7T0JgApvE74tT oIpcJK58OQN1nrDEq+Nb2EFmSghIS1w6agtR384osXnOPRYIp4NR4v7KRlaIBmOJU12NTCA2 swCfxLuvPawQzbwSHW1CEKaHxI9FAhDVjhJ3GvuhwTKDUeJ2cwfLBEapBYwMqxjFUguKc9NT iw0LjPWKE3OLS/PS9ZLzczcxgpOJlvkOxg3nfA4xCnAwKvHw7rhyJ1KINbGsuDL3EKMEB7OS CK9F4d1IId6UxMqq1KL8+KLSnNTiQ4ymwKCZyCwlmpwPTHR5JfGGJpYGJmZGwMRgaWioJM4r tv5ahJBAemJJanZqakFqEUwfEwenVANjaGDAZfXHq/ebMS/1PjyjyfNC9Ycf87RV9v972OiX J143/Znc6Rze9xas8y2SUr1uPH1/Zi/3rrT+bTw70ifd+1ERctNbm62bS2Ve7OXpvfVFNzje pWYmFqwtYXoudOf/HQX2ydN/32v2yLc1m3rma/TFB31yvRqxP53PMM0/qaPb7zy/S15JiaU4 I9FQi7moOBEASjPMWDwDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphluLIzCtJLcpLzFFi42I5/e+xgG5V991IgyVT1Swm3rjCYnH9y3NW i0n3J7BYnG16w25xedccNovPvUcYLW43rmCzeLziLbsDh8fiPS+ZPDat6mTz6NuyitHj8ya5 AJYoLpuU1JzMstQifbsEroz176+zFPzmq9j36CxjA+Neni5GTg4JAROJed8bWboYuTiEBHYy SvTcucgK4fxglNjyeDoTSBWbgJbE/hc32EBsEQE/ie3z1zOCFDELNDFKLO+/BZYQFkiQWDT1 MHMXIwcHi4CqxN8ZBSBhXgEXibnb37NDbJOT+LDnEZjNKeAqMXnWKTBbCKjmx+qXjBMYeRYw MqxilEwtKM5Nzy02KjDMSy3XK07MLS7NS9dLzs/dxAgMo22Htfp2MN5fEn+IUYCDUYmHV+D6 nUgh1sSy4srcQ4wSHMxKIrwWhXcjhXhTEiurUovy44tKc1KLDzFKc7AoifPezjsWKSSQnliS mp2aWpBaBJNl4uCUamCUuRmy7vXnNwuv371SnXPjuaLQLDtGuey7W+NvmjxayPP0x+KcEKVQ Pm72fr9p/sH+m9KUr8hdCyldUnV914m4wllyvetEXc781xZa88X3Yxxzw4vHgZf3ZN8M4tc9 EPWyKa/A6f8+7jULJebYFPxsOq74/+FT7XnCSrvO/1B6snHzPfu7r45zK7EUZyQaajEXFScC AJf6WAkfAgAA X-CMS-MailID: 20171011030946epcas1p11592eaf29e9b9717ccf7a8965d8e2286 X-Msg-Generator: CA X-Sender-IP: 182.195.42.142 X-Local-Sender: =?UTF-8?B?7LWc7LCs7JqwG1RpemVuIFBsYXRmb3JtIExhYihTL1fshLw=?= =?UTF-8?B?7YSwKRvsgrzshLHsoITsnpAbU2VuaW9yIEVuZ2luZWVy?= X-Global-Sender: =?UTF-8?B?Q2hhbndvbyBDaG9pG1RpemVuIFBsYXRmb3JtIExhYi4bU2Ft?= =?UTF-8?B?c3VuZyBFbGVjdHJvbmljcxtTZW5pb3IgRW5naW5lZXI=?= X-Sender-Code: =?UTF-8?B?QzEwG1RFTEUbQzEwVjgxMTE=?= CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20171011030946epcas1p11592eaf29e9b9717ccf7a8965d8e2286 X-RootMTR: 20171011030946epcas1p11592eaf29e9b9717ccf7a8965d8e2286 References: <1507691364-3899-1-git-send-email-cw00.choi@samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit 3104fa3081126c9bda35793af5f335d0ee0d5818. 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 --- drivers/devfreq/devfreq.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index ae8717a6eee1..2ce1fd0a1324 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -1125,6 +1125,12 @@ static ssize_t min_freq_store(struct device *dev, struct device_attribute *attr, 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) { @@ -1151,17 +1157,13 @@ static ssize_t max_freq_store(struct device *dev, struct device_attribute *attr, 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, -- 1.9.1