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: Dan Carpenter <error27@gmail.com>
Signed-off-by: Eric Anholt <eric@anholt.net>

diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index de2b9619383d9381ce3c2bd6a875f93268613e9b..d61ffbc381e52846f4734f0eb3f3acaaf6f53f0e 100644 (file)
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -896,8 +896,6 @@ static const struct tv_mode tv_modes[] = {
        },
 };
 
-#define NUM_TV_MODES sizeof(tv_modes) / sizeof (tv_modes[0])
-
 static void
 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
                tv_priv->margin[TV_MARGIN_BOTTOM] = val;
                changed = true;
        } else if (property == dev->mode_config.tv_mode_property) {
-               if (val >= NUM_TV_MODES) {
+               if (val >= ARRAY_SIZE(tv_modes)) {
                        ret = -EINVAL;
                        goto out;
                }
@@ -1693,13 +1691,13 @@ intel_tv_init(struct drm_device *dev)
        connector->doublescan_allowed = false;
 
        /* 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);
        if (!tv_format_names)
                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;
-       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,
                                   initial_mode);