Commit 2991196f authored by Dan Carpenter's avatar Dan Carpenter Committed by Eric Anholt

drm/i915: cleanup: use ARRAY_SIZE()

NUM_TV_MODES is the same as ARRAY_SIZE(tv_modes).  In the end, I
decided it was cleaner to remove NUM_TV_MODES and just use
ARRAY_SIZE(tv_modes) through out.
Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent cbb465e7
...@@ -896,8 +896,6 @@ static const struct tv_mode tv_modes[] = { ...@@ -896,8 +896,6 @@ static const struct tv_mode tv_modes[] = {
}, },
}; };
#define NUM_TV_MODES sizeof(tv_modes) / sizeof (tv_modes[0])
static void static void
intel_tv_dpms(struct drm_encoder *encoder, int mode) intel_tv_dpms(struct drm_encoder *encoder, int mode)
{ {
...@@ -1512,7 +1510,7 @@ intel_tv_set_property(struct drm_connector *connector, struct drm_property *prop ...@@ -1512,7 +1510,7 @@ intel_tv_set_property(struct drm_connector *connector, struct drm_property *prop
tv_priv->margin[TV_MARGIN_BOTTOM] = val; tv_priv->margin[TV_MARGIN_BOTTOM] = val;
changed = true; changed = true;
} else if (property == dev->mode_config.tv_mode_property) { } else if (property == dev->mode_config.tv_mode_property) {
if (val >= NUM_TV_MODES) { if (val >= ARRAY_SIZE(tv_modes)) {
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
...@@ -1693,13 +1691,13 @@ intel_tv_init(struct drm_device *dev) ...@@ -1693,13 +1691,13 @@ intel_tv_init(struct drm_device *dev)
connector->doublescan_allowed = false; connector->doublescan_allowed = false;
/* Create TV properties then attach current values */ /* Create TV properties then attach current values */
tv_format_names = kmalloc(sizeof(char *) * NUM_TV_MODES, tv_format_names = kmalloc(sizeof(char *) * ARRAY_SIZE(tv_modes),
GFP_KERNEL); GFP_KERNEL);
if (!tv_format_names) if (!tv_format_names)
goto out; goto out;
for (i = 0; i < NUM_TV_MODES; i++) for (i = 0; i < ARRAY_SIZE(tv_modes); i++)
tv_format_names[i] = tv_modes[i].name; tv_format_names[i] = tv_modes[i].name;
drm_mode_create_tv_properties(dev, NUM_TV_MODES, tv_format_names); drm_mode_create_tv_properties(dev, ARRAY_SIZE(tv_modes), tv_format_names);
drm_connector_attach_property(connector, dev->mode_config.tv_mode_property, drm_connector_attach_property(connector, dev->mode_config.tv_mode_property,
initial_mode); initial_mode);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment