Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7d234dc authored by Jérémy Lefaure's avatar Jérémy Lefaure Committed by Daniel Vetter
Browse files

drm/gma500: use ARRAY_SIZE 



Using the ARRAY_SIZE macro improves the readability of the code. Also,
it is useless to re-invent it.

Found with Coccinelle with the following semantic patch:
@r depends on (org || report)@
type T;
T[] E;
position p;
@@
(
 (sizeof(E)@p /sizeof(*E))
|
 (sizeof(E)@p /sizeof(E[...]))
|
 (sizeof(E)@p /sizeof(T))
)

Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarJérémy Lefaure <jeremy.lefaure@lse.epita.fr>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20171016023047.19145-1-jeremy.lefaure@lse.epita.fr
parent bfddd146

drivers/gpu/drm/gma500/psb_intel_sdvo.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include "psb_drv.h"

#include "psb_drv.h"

#include "psb_intel_sdvo_regs.h"

#include "psb_intel_sdvo_regs.h"

#include "psb_intel_reg.h"

#include "psb_intel_reg.h"

#include <linux/kernel.h>





#define SDVO_TMDS_MASK (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1)

#define SDVO_TMDS_MASK (SDVO_OUTPUT_TMDS0 | SDVO_OUTPUT_TMDS1)

#define SDVO_RGB_MASK  (SDVO_OUTPUT_RGB0 | SDVO_OUTPUT_RGB1)

#define SDVO_RGB_MASK  (SDVO_OUTPUT_RGB0 | SDVO_OUTPUT_RGB1)
@@ -62,8 +63,6 @@ static const char *tv_format_names[] = { 
	"SECAM_60"

	"SECAM_60"

};

};





#define TV_FORMAT_NUM  (sizeof(tv_format_names) / sizeof(*tv_format_names))



struct psb_intel_sdvo {

struct psb_intel_sdvo {

	struct gma_encoder base;

	struct gma_encoder base;
@@ -148,7 +147,7 @@ struct psb_intel_sdvo_connector { 
	int force_audio;

	int force_audio;





	/* This contains all current supported TV format */

	/* This contains all current supported TV format */

	u8 tv_format_supported[TV_FORMAT_NUM];

	u8 tv_format_supported[ARRAY_SIZE(tv_format_names)];

	int   format_supported_num;

	int   format_supported_num;

	struct drm_property *tv_format;

	struct drm_property *tv_format;
@@ -1709,7 +1708,7 @@ psb_intel_sdvo_set_property(struct drm_connector *connector, 
	}

	}





	if (property == psb_intel_sdvo_connector->tv_format) {

	if (property == psb_intel_sdvo_connector->tv_format) {

		if (val >= TV_FORMAT_NUM)

		if (val >= ARRAY_SIZE(tv_format_names))

			return -EINVAL;

			return -EINVAL;





		if (psb_intel_sdvo->tv_format_index ==

		if (psb_intel_sdvo->tv_format_index ==
@@ -2269,7 +2268,7 @@ static bool psb_intel_sdvo_tv_create_property(struct psb_intel_sdvo *psb_intel_s 
		return false;

		return false;





	psb_intel_sdvo_connector->format_supported_num = 0;

	psb_intel_sdvo_connector->format_supported_num = 0;

	for (i = 0 ; i < TV_FORMAT_NUM; i++)

	for (i = 0 ; i < ARRAY_SIZE(tv_format_names); i++)

		if (format_map & (1 << i))

		if (format_map & (1 << i))

			psb_intel_sdvo_connector->tv_format_supported[psb_intel_sdvo_connector->format_supported_num++] = i;

			psb_intel_sdvo_connector->tv_format_supported[psb_intel_sdvo_connector->format_supported_num++] = i;