Commit b8c75bd9 authored by Lucas De Marchi's avatar Lucas De Marchi
Browse files

drm: Convert open-coded yes/no strings to yesno() 



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: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220126093951.1470898-10-lucas.demarchi@intel.com
parent 7994369f

drivers/gpu/drm/amd/amdgpu/atom.c

+3 −1
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#include <linux/module.h>

#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/string_helpers.h>



#include <asm/unaligned.h>



#include <drm/drm_util.h>
@@ -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)) {

drivers/gpu/drm/dp/drm_dp.c

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/module.h>

#include <linux/sched.h>

#include <linux/seq_file.h>

#include <linux/string_helpers.h>



#include <drm/dp/drm_dp_helper.h>

#include <drm/drm_print.h>
@@ -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;

drivers/gpu/drm/drm_client_modeset.c

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/slab.h>

#include <linux/string_helpers.h>



#include <drm/drm_atomic.h>

#include <drm/drm_client.h>
@@ -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];

	}

drivers/gpu/drm/drm_gem.c

+2 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/pagevec.h>

#include <linux/shmem_fs.h>

#include <linux/slab.h>

#include <linux/string_helpers.h>

#include <linux/types.h>

#include <linux/uaccess.h>
@@ -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);

drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c

+4 −1
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 
 *

 * Authors: Ben Skeggs

 */



#include <linux/string_helpers.h>



#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