Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp5506310pxb; Wed, 26 Jan 2022 13:39:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJyr6NN6AQA4/dU1/dU2XXRuoTY9BaF7YWejOetrTAzlBl3v5jfgGhkkCciYa1+2HULKMVNt X-Received: by 2002:a17:907:1606:: with SMTP id hb6mr529391ejc.147.1643233198305; Wed, 26 Jan 2022 13:39:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643233198; cv=none; d=google.com; s=arc-20160816; b=L9b6/uCpjVREQoQtRuXkwhbWJ/9xG8xbZiuHL2Xd2HlWD0G35B2NMbxHin7gab7UHK jSOLvG5jcWLwOMT/A9cy6idUK01JDCDxvEI0DMvXjvnaK9VeQTAyN2xeuu30CmTMqM4+ DE8CeiDDClxJPUE4722O1XoJa2pcTEcKaigT+lzayLGG+bQX1+vPTqG9PqlIy0fUITaX GVMy/kKCueqAMLhI8lNfVgeTiAFfJy2MJDlBlrTqdHiqZuVa/y6XtNY05aQ3WXuoi2YU Jpe0pGKGcZp7el/QzZM85UZDU1ETbxkaznHvE7ZTYNxaObEntmgTBSbBI8TBJrnnUzc3 d3Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:references :organization:in-reply-to:subject:cc:to:from:dkim-signature; bh=GpcBGBz5VcXUBthJlMaGCY+2TkwAT5w2kDOPC/pDaSQ=; b=BbEnLfM4oa0tZ3UmT1vnAPGd5ZquzUpJCzLJ9AfLdlaorpaDb9iwsmehMNDe+vk3lj Ae0Ckv9Tvzuj94OTLaLChCBXvdfTTt2OKR1JOl4nuLpCu4JpJQxs1W4wwhnKpQ5IiJs6 zdczI4Uz0jtMMpPNl75H5TK/1xnX/wv8IB5Q1xJ95C4VvXLFt4jl2o5PXXFeVaQZ4be0 sayED5abV37/fAMDpOpPbQbjCh4Q3sDaqyyg2GEsh2r+KN3Frep+nwAV4gC+dFYv8s/v 0xHIExlcZtBYi1CRop6t4pxqoNq01BHcw71YArb9TJoPA9FLHR/YlSR7hsXRNKqNjN8C 5btA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NF+5n6g7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g9si214258edv.529.2022.01.26.13.39.33; Wed, 26 Jan 2022 13:39:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NF+5n6g7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242437AbiAZO5g (ORCPT + 99 others); Wed, 26 Jan 2022 09:57:36 -0500 Received: from mga04.intel.com ([192.55.52.120]:16003 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235732AbiAZO5d (ORCPT ); Wed, 26 Jan 2022 09:57:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643209053; x=1674745053; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=Naq9bU8Eug7aC4jYDxIsWIp4xb2ekXmzmY6NZVxr3bQ=; b=NF+5n6g7TyN6x4uPPJRhvHmPzAPpuRgpfGfmXUvAe2zpL5g6VQgVn382 HkiA+JEO6OJXZ/fv48jmaQwDYA3JNOsRMt9HUpTv3AJgo8By98p0SaL6o ogqY3Oq+SuZiMANp+5XQUlwtpF/ZtrgnfsJ0nK0HBFKoknGNUgJHhg+f/ aq0pK0w39qfDW5K2crKPhzrRbJk8ZapFam2zdmsgRYsGAM+UljGRfD97l Nb4aVzQsKTyr/YNGtF+u2HNJ8KrlXbfDNJb4PWvcxS5LULdht4k3FT9iZ xYDHDA54UG4jgcsrFUqBKk7lvWHGS0Shj4VqFTk7N1xtJ90GZ1juD8WPK A==; X-IronPort-AV: E=McAfee;i="6200,9189,10238"; a="245398438" X-IronPort-AV: E=Sophos;i="5.88,318,1635231600"; d="scan'208";a="245398438" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jan 2022 06:57:33 -0800 X-IronPort-AV: E=Sophos;i="5.88,318,1635231600"; d="scan'208";a="628324945" Received: from nbasu-mobl.ger.corp.intel.com (HELO localhost) ([10.252.16.197]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Jan 2022 06:57:21 -0800 From: Jani Nikula To: Lucas De Marchi , linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, linux-security-module@vger.kernel.org, nouveau@lists.freedesktop.org, netdev@vger.kernel.org Cc: Alex Deucher , Andrew Morton , Andy Shevchenko , Andy Shevchenko , Ben Skeggs , Christian =?utf-8?Q?K=C3=B6nig?= , Chris Wilson , Daniel Vetter , David Airlie , "David S. Miller" , Emma Anholt , Francis Laniel , Greg Kroah-Hartman , Harry Wentland , Jakub Kicinski , Joonas Lahtinen , Julia Lawall , Kentaro Takeda , Leo Li , Petr Mladek , Rahul Lakkireddy , Raju Rangoju , Rasmus Villemoes , Rodrigo Vivi , Sakari Ailus , Sergey Senozhatsky , Steven Rostedt , Vishal Kulkarni Subject: Re: [PATCH v2 09/11] drm: Convert open-coded yes/no strings to yesno() In-Reply-To: <20220126093951.1470898-10-lucas.demarchi@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20220126093951.1470898-1-lucas.demarchi@intel.com> <20220126093951.1470898-10-lucas.demarchi@intel.com> Date: Wed, 26 Jan 2022 16:57:18 +0200 Message-ID: <87y232y27l.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 26 Jan 2022, Lucas De Marchi wrote: > linux/string_helpers.h provides a helper to return "yes"/"no" strings. > Replace the open coded versions with str_yes_no(). The places were > identified with the following semantic patch: > > @@ > expression b; > @@ > > - b ? "yes" : "no" > + str_yes_no(b) > > Then the includes were added, so we include-what-we-use, and parenthesis > adjusted in drivers/gpu/drm/v3d/v3d_debugfs.c. After the conversion we > still see the same binary sizes: > > text data bss dec hex filename > 51149 3295 212 54656 d580 virtio/virtio-gpu.ko.old > 51149 3295 212 54656 d580 virtio/virtio-gpu.ko > 1441491 60340 800 1502631 16eda7 radeon/radeon.ko.old > 1441491 60340 800 1502631 16eda7 radeon/radeon.ko > 6125369 328538 34000 6487907 62ff63 amd/amdgpu/amdgpu.ko.old > 6125369 328538 34000 6487907 62ff63 amd/amdgpu/amdgpu.ko > 411986 10490 6176 428652 68a6c drm.ko.old > 411986 10490 6176 428652 68a6c drm.ko > 98129 1636 264 100029 186bd dp/drm_dp_helper.ko.old > 98129 1636 264 100029 186bd dp/drm_dp_helper.ko > 1973432 109640 2352 2085424 1fd230 nouveau/nouveau.ko.old > 1973432 109640 2352 2085424 1fd230 nouveau/nouveau.ko > > Signed-off-by: Lucas De Marchi Reviewed-by: Jani Nikula > --- > drivers/gpu/drm/amd/amdgpu/atom.c | 4 +++- > drivers/gpu/drm/dp/drm_dp.c | 3 ++- > drivers/gpu/drm/drm_client_modeset.c | 3 ++- > drivers/gpu/drm/drm_gem.c | 3 ++- > drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c | 5 ++++- > drivers/gpu/drm/radeon/atom.c | 3 ++- > drivers/gpu/drm/v3d/v3d_debugfs.c | 11 ++++++----- > drivers/gpu/drm/virtio/virtgpu_debugfs.c | 4 +++- > 8 files changed, 24 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/atom.c b/drivers/gpu/drm/amd/amdgpu/atom.c > index 6fa2229b7229..1c5d9388ad0b 100644 > --- a/drivers/gpu/drm/amd/amdgpu/atom.c > +++ b/drivers/gpu/drm/amd/amdgpu/atom.c > @@ -25,6 +25,8 @@ > #include > #include > #include > +#include > + > #include > > #include > @@ -740,7 +742,7 @@ static void atom_op_jump(atom_exec_context *ctx, int *ptr, int arg) > break; > } > if (arg != ATOM_COND_ALWAYS) > - SDEBUG(" taken: %s\n", execute ? "yes" : "no"); > + SDEBUG(" taken: %s\n", str_yes_no(execute)); > SDEBUG(" target: 0x%04X\n", target); > if (execute) { > if (ctx->last_jump == (ctx->start + target)) { > diff --git a/drivers/gpu/drm/dp/drm_dp.c b/drivers/gpu/drm/dp/drm_dp.c > index 6d43325acca5..c43577c8ac4d 100644 > --- a/drivers/gpu/drm/dp/drm_dp.c > +++ b/drivers/gpu/drm/dp/drm_dp.c > @@ -28,6 +28,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -1239,7 +1240,7 @@ void drm_dp_downstream_debug(struct seq_file *m, > bool branch_device = drm_dp_is_branch(dpcd); > > seq_printf(m, "\tDP branch device present: %s\n", > - branch_device ? "yes" : "no"); > + str_yes_no(branch_device)); > > if (!branch_device) > return; > diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c > index ced09c7c06f9..e6346a67cd98 100644 > --- a/drivers/gpu/drm/drm_client_modeset.c > +++ b/drivers/gpu/drm/drm_client_modeset.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -241,7 +242,7 @@ static void drm_client_connectors_enabled(struct drm_connector **connectors, > connector = connectors[i]; > enabled[i] = drm_connector_enabled(connector, true); > DRM_DEBUG_KMS("connector %d enabled? %s\n", connector->base.id, > - connector->display_info.non_desktop ? "non desktop" : enabled[i] ? "yes" : "no"); > + connector->display_info.non_desktop ? "non desktop" : str_yes_no(enabled[i])); > > any_enabled |= enabled[i]; > } > diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c > index 21631c22b374..3c888db59ea4 100644 > --- a/drivers/gpu/drm/drm_gem.c > +++ b/drivers/gpu/drm/drm_gem.c > @@ -37,6 +37,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -1145,7 +1146,7 @@ void drm_gem_print_info(struct drm_printer *p, unsigned int indent, > drm_vma_node_start(&obj->vma_node)); > drm_printf_indent(p, indent, "size=%zu\n", obj->size); > drm_printf_indent(p, indent, "imported=%s\n", > - obj->import_attach ? "yes" : "no"); > + str_yes_no(obj->import_attach)); > > if (obj->funcs->print_info) > obj->funcs->print_info(p, indent, obj); > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c > index a11637b0f6cc..d063d0dc13c5 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c > @@ -21,6 +21,9 @@ > * > * Authors: Ben Skeggs > */ > + > +#include > + > #include "aux.h" > #include "pad.h" > > @@ -94,7 +97,7 @@ void > nvkm_i2c_aux_monitor(struct nvkm_i2c_aux *aux, bool monitor) > { > struct nvkm_i2c_pad *pad = aux->pad; > - AUX_TRACE(aux, "monitor: %s", monitor ? "yes" : "no"); > + AUX_TRACE(aux, "monitor: %s", str_yes_no(monitor)); > if (monitor) > nvkm_i2c_pad_mode(pad, NVKM_I2C_PAD_AUX); > else > diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c > index f15b20da5315..c1bbfbe28bda 100644 > --- a/drivers/gpu/drm/radeon/atom.c > +++ b/drivers/gpu/drm/radeon/atom.c > @@ -25,6 +25,7 @@ > #include > #include > #include > +#include > > #include > > @@ -722,7 +723,7 @@ static void atom_op_jump(atom_exec_context *ctx, int *ptr, int arg) > break; > } > if (arg != ATOM_COND_ALWAYS) > - SDEBUG(" taken: %s\n", execute ? "yes" : "no"); > + SDEBUG(" taken: %s\n", str_yes_no(execute)); > SDEBUG(" target: 0x%04X\n", target); > if (execute) { > if (ctx->last_jump == (ctx->start + target)) { > diff --git a/drivers/gpu/drm/v3d/v3d_debugfs.c b/drivers/gpu/drm/v3d/v3d_debugfs.c > index e76b24bb8828..29fd13109e43 100644 > --- a/drivers/gpu/drm/v3d/v3d_debugfs.c > +++ b/drivers/gpu/drm/v3d/v3d_debugfs.c > @@ -6,6 +6,7 @@ > #include > #include > #include > +#include > > #include > > @@ -148,15 +149,15 @@ static int v3d_v3d_debugfs_ident(struct seq_file *m, void *unused) > V3D_GET_FIELD(ident3, V3D_HUB_IDENT3_IPREV), > V3D_GET_FIELD(ident3, V3D_HUB_IDENT3_IPIDX)); > seq_printf(m, "MMU: %s\n", > - (ident2 & V3D_HUB_IDENT2_WITH_MMU) ? "yes" : "no"); > + str_yes_no(ident2 & V3D_HUB_IDENT2_WITH_MMU)); > seq_printf(m, "TFU: %s\n", > - (ident1 & V3D_HUB_IDENT1_WITH_TFU) ? "yes" : "no"); > + str_yes_no(ident1 & V3D_HUB_IDENT1_WITH_TFU)); > seq_printf(m, "TSY: %s\n", > - (ident1 & V3D_HUB_IDENT1_WITH_TSY) ? "yes" : "no"); > + str_yes_no(ident1 & V3D_HUB_IDENT1_WITH_TSY)); > seq_printf(m, "MSO: %s\n", > - (ident1 & V3D_HUB_IDENT1_WITH_MSO) ? "yes" : "no"); > + str_yes_no(ident1 & V3D_HUB_IDENT1_WITH_MSO)); > seq_printf(m, "L3C: %s (%dkb)\n", > - (ident1 & V3D_HUB_IDENT1_WITH_L3C) ? "yes" : "no", > + str_yes_no(ident1 & V3D_HUB_IDENT1_WITH_L3C), > V3D_GET_FIELD(ident2, V3D_HUB_IDENT2_L3C_NKB)); > > for (core = 0; core < cores; core++) { > diff --git a/drivers/gpu/drm/virtio/virtgpu_debugfs.c b/drivers/gpu/drm/virtio/virtgpu_debugfs.c > index b6954e2f75e6..853dd9aa397e 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_debugfs.c > +++ b/drivers/gpu/drm/virtio/virtgpu_debugfs.c > @@ -23,6 +23,8 @@ > * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. > */ > > +#include > + > #include > #include > > @@ -31,7 +33,7 @@ > static void virtio_gpu_add_bool(struct seq_file *m, const char *name, > bool value) > { > - seq_printf(m, "%-16s : %s\n", name, value ? "yes" : "no"); > + seq_printf(m, "%-16s : %s\n", name, str_yes_no(value)); > } > > static void virtio_gpu_add_int(struct seq_file *m, const char *name, int value) -- Jani Nikula, Intel Open Source Graphics Center