| Message ID | 1441022968-7468-1-git-send-email-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Aug 31, 2015 at 8:09 AM, <ville.syrjala@linux.intel.com> wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Make generic_edid_names[] const since it's supposed to be immutable. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> For the series: Reviewed-by: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/gpu/drm/drm_edid_load.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c > index 1f445e9..698b8c3 100644 > --- a/drivers/gpu/drm/drm_edid_load.c > +++ b/drivers/gpu/drm/drm_edid_load.c > @@ -32,7 +32,7 @@ MODULE_PARM_DESC(edid_firmware, "Do not probe monitor, use specified EDID blob " > "from built-in data or /lib/firmware instead. "); > > #define GENERIC_EDIDS 6 > -static const char *generic_edid_name[GENERIC_EDIDS] = { > +static const char * const generic_edid_name[GENERIC_EDIDS] = { > "edid/800x600.bin", > "edid/1024x768.bin", > "edid/1280x1024.bin", > -- > 2.4.6 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
On Mon, Aug 31, 2015 at 10:52:03AM -0400, Alex Deucher wrote: > On Mon, Aug 31, 2015 at 8:09 AM, <ville.syrjala@linux.intel.com> wrote: > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > Make generic_edid_names[] const since it's supposed to be immutable. > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > For the series: > Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Merged patches 1-3 to drm-misc, but 4th conflicts badly. Just for easier merging I'd prefer if you can split it up per-driver if possible - with all the atomic conversions I expect a lot of random context conflicts to keep coming in. Thanks, Daniel
On Tue, Sep 01, 2015 at 10:47:48AM +0200, Daniel Vetter wrote: > On Mon, Aug 31, 2015 at 10:52:03AM -0400, Alex Deucher wrote: > > On Mon, Aug 31, 2015 at 8:09 AM, <ville.syrjala@linux.intel.com> wrote: > > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > > > Make generic_edid_names[] const since it's supposed to be immutable. > > > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > For the series: > > Reviewed-by: Alex Deucher <alexander.deucher@amd.com> > > Merged patches 1-3 to drm-misc, but 4th conflicts badly. Just for easier > merging I'd prefer if you can split it up per-driver if possible - with > all the atomic conversions I expect a lot of random context conflicts to > keep coming in. Well, that was a good waste of some time, but I did manage to split it up. Not sure I should bother spamming the list with it, but it's available here: git://github.com/vsyrjala/linux.git const_funcs
diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c index 1f445e9..698b8c3 100644 --- a/drivers/gpu/drm/drm_edid_load.c +++ b/drivers/gpu/drm/drm_edid_load.c @@ -32,7 +32,7 @@ MODULE_PARM_DESC(edid_firmware, "Do not probe monitor, use specified EDID blob " "from built-in data or /lib/firmware instead. "); #define GENERIC_EDIDS 6 -static const char *generic_edid_name[GENERIC_EDIDS] = { +static const char * const generic_edid_name[GENERIC_EDIDS] = { "edid/800x600.bin", "edid/1024x768.bin", "edid/1280x1024.bin",