| Message ID | 1376435848-14584-3-git-send-email-damien.lespiau@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Aug 14, 2013 at 12:17:18AM +0100, Damien Lespiau wrote: > A few styles issues have crept in here, fix them before touching this > code again. > > v2: constify arguments that can be (Ville Syrjälä) > > Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> > --- > drivers/gpu/drm/drm_edid.c | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index e014785..9e9b6ed 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -2301,7 +2301,7 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid, > /* > * Search EDID for CEA extension block. > */ > -static u8 *drm_find_cea_extension(struct edid *edid) > +static u8 *drm_find_cea_extension(const struct edid *edid) This guy still casts away the const internally. Not sure if something will complain about that. So maybe just drop this bit for now. A long time ago I posted a big contify everything in drm_edid.c patch, and it did in a way that didn't ad new warnings even w/ -Wcast-qual. Maybe I should resurrect it. > { > u8 *edid_ext = NULL; > int i; > @@ -2441,10 +2441,11 @@ add_alternate_cea_modes(struct drm_connector *connector, struct edid *edid) > } > > static int > -do_cea_modes (struct drm_connector *connector, u8 *db, u8 len) > +do_cea_modes(struct drm_connector *connector, const u8 *db, u8 len) > { > struct drm_device *dev = connector->dev; > - u8 * mode, cea_mode; > + const u8 *mode; > + u8 cea_mode; > int modes = 0; > > for (mode = db; mode < db + len; mode++) { > @@ -2499,10 +2500,10 @@ cea_db_offsets(const u8 *cea, int *start, int *end) > for ((i) = (start); (i) < (end) && (i) + cea_db_payload_len(&(cea)[(i)]) < (end); (i) += cea_db_payload_len(&(cea)[(i)]) + 1) > > static int > -add_cea_modes(struct drm_connector *connector, struct edid *edid) > +add_cea_modes(struct drm_connector *connector, const struct edid *edid) > { > - u8 * cea = drm_find_cea_extension(edid); > - u8 * db, dbl; > + u8 *cea = drm_find_cea_extension(edid); > + u8 *db, dbl; cea and db could be const here. > int modes = 0; > > if (cea && cea_revision(cea) >= 3) { > @@ -2516,7 +2517,7 @@ add_cea_modes(struct drm_connector *connector, struct edid *edid) > dbl = cea_db_payload_len(db); > > if (cea_db_tag(db) == VIDEO_BLOCK) > - modes += do_cea_modes (connector, db+1, dbl); > + modes += do_cea_modes(connector, db + 1, dbl); > } > } > > -- > 1.8.3.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index e014785..9e9b6ed 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -2301,7 +2301,7 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid, /* * Search EDID for CEA extension block. */ -static u8 *drm_find_cea_extension(struct edid *edid) +static u8 *drm_find_cea_extension(const struct edid *edid) { u8 *edid_ext = NULL; int i; @@ -2441,10 +2441,11 @@ add_alternate_cea_modes(struct drm_connector *connector, struct edid *edid) } static int -do_cea_modes (struct drm_connector *connector, u8 *db, u8 len) +do_cea_modes(struct drm_connector *connector, const u8 *db, u8 len) { struct drm_device *dev = connector->dev; - u8 * mode, cea_mode; + const u8 *mode; + u8 cea_mode; int modes = 0; for (mode = db; mode < db + len; mode++) { @@ -2499,10 +2500,10 @@ cea_db_offsets(const u8 *cea, int *start, int *end) for ((i) = (start); (i) < (end) && (i) + cea_db_payload_len(&(cea)[(i)]) < (end); (i) += cea_db_payload_len(&(cea)[(i)]) + 1) static int -add_cea_modes(struct drm_connector *connector, struct edid *edid) +add_cea_modes(struct drm_connector *connector, const struct edid *edid) { - u8 * cea = drm_find_cea_extension(edid); - u8 * db, dbl; + u8 *cea = drm_find_cea_extension(edid); + u8 *db, dbl; int modes = 0; if (cea && cea_revision(cea) >= 3) { @@ -2516,7 +2517,7 @@ add_cea_modes(struct drm_connector *connector, struct edid *edid) dbl = cea_db_payload_len(db); if (cea_db_tag(db) == VIDEO_BLOCK) - modes += do_cea_modes (connector, db+1, dbl); + modes += do_cea_modes(connector, db + 1, dbl); } }
A few styles issues have crept in here, fix them before touching this code again. v2: constify arguments that can be (Ville Syrjälä) Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> --- drivers/gpu/drm/drm_edid.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)