| Message ID | 20180920185145.1912-2-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Infoframe precompute/check | expand |
On 09/20/18 20:51, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > The unpack functions just read from the passed in buffer, > so make it const. > > Cc: Thierry Reding <thierry.reding@gmail.com> > Cc: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Thanks! Hans > Cc: linux-media@vger.kernel.org > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/video/hdmi.c | 23 ++++++++++++----------- > include/linux/hdmi.h | 3 ++- > 2 files changed, 14 insertions(+), 12 deletions(-) > > diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c > index 38716eb50408..65b915ea4936 100644 > --- a/drivers/video/hdmi.c > +++ b/drivers/video/hdmi.c > @@ -31,7 +31,7 @@ > > #define hdmi_log(fmt, ...) dev_printk(level, dev, fmt, ##__VA_ARGS__) > > -static u8 hdmi_infoframe_checksum(u8 *ptr, size_t size) > +static u8 hdmi_infoframe_checksum(const u8 *ptr, size_t size) > { > u8 csum = 0; > size_t i; > @@ -1016,9 +1016,9 @@ EXPORT_SYMBOL(hdmi_infoframe_log); > * Returns 0 on success or a negative error code on failure. > */ > static int hdmi_avi_infoframe_unpack(struct hdmi_avi_infoframe *frame, > - void *buffer) > + const void *buffer) > { > - u8 *ptr = buffer; > + const u8 *ptr = buffer; > int ret; > > if (ptr[0] != HDMI_INFOFRAME_TYPE_AVI || > @@ -1079,9 +1079,9 @@ static int hdmi_avi_infoframe_unpack(struct hdmi_avi_infoframe *frame, > * Returns 0 on success or a negative error code on failure. > */ > static int hdmi_spd_infoframe_unpack(struct hdmi_spd_infoframe *frame, > - void *buffer) > + const void *buffer) > { > - u8 *ptr = buffer; > + const u8 *ptr = buffer; > int ret; > > if (ptr[0] != HDMI_INFOFRAME_TYPE_SPD || > @@ -1117,9 +1117,9 @@ static int hdmi_spd_infoframe_unpack(struct hdmi_spd_infoframe *frame, > * Returns 0 on success or a negative error code on failure. > */ > static int hdmi_audio_infoframe_unpack(struct hdmi_audio_infoframe *frame, > - void *buffer) > + const void *buffer) > { > - u8 *ptr = buffer; > + const u8 *ptr = buffer; > int ret; > > if (ptr[0] != HDMI_INFOFRAME_TYPE_AUDIO || > @@ -1163,9 +1163,9 @@ static int hdmi_audio_infoframe_unpack(struct hdmi_audio_infoframe *frame, > */ > static int > hdmi_vendor_any_infoframe_unpack(union hdmi_vendor_any_infoframe *frame, > - void *buffer) > + const void *buffer) > { > - u8 *ptr = buffer; > + const u8 *ptr = buffer; > size_t length; > int ret; > u8 hdmi_video_format; > @@ -1234,10 +1234,11 @@ hdmi_vendor_any_infoframe_unpack(union hdmi_vendor_any_infoframe *frame, > * > * Returns 0 on success or a negative error code on failure. > */ > -int hdmi_infoframe_unpack(union hdmi_infoframe *frame, void *buffer) > +int hdmi_infoframe_unpack(union hdmi_infoframe *frame, > + const void *buffer) > { > int ret; > - u8 *ptr = buffer; > + const u8 *ptr = buffer; > > switch (ptr[0]) { > case HDMI_INFOFRAME_TYPE_AVI: > diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h > index d271ff23984f..d3816170c062 100644 > --- a/include/linux/hdmi.h > +++ b/include/linux/hdmi.h > @@ -332,7 +332,8 @@ union hdmi_infoframe { > > ssize_t > hdmi_infoframe_pack(union hdmi_infoframe *frame, void *buffer, size_t size); > -int hdmi_infoframe_unpack(union hdmi_infoframe *frame, void *buffer); > +int hdmi_infoframe_unpack(union hdmi_infoframe *frame, > + const void *buffer); > void hdmi_infoframe_log(const char *level, struct device *dev, > union hdmi_infoframe *frame); > >
diff --git a/drivers/video/hdmi.c b/drivers/video/hdmi.c index 38716eb50408..65b915ea4936 100644 --- a/drivers/video/hdmi.c +++ b/drivers/video/hdmi.c @@ -31,7 +31,7 @@ #define hdmi_log(fmt, ...) dev_printk(level, dev, fmt, ##__VA_ARGS__) -static u8 hdmi_infoframe_checksum(u8 *ptr, size_t size) +static u8 hdmi_infoframe_checksum(const u8 *ptr, size_t size) { u8 csum = 0; size_t i; @@ -1016,9 +1016,9 @@ EXPORT_SYMBOL(hdmi_infoframe_log); * Returns 0 on success or a negative error code on failure. */ static int hdmi_avi_infoframe_unpack(struct hdmi_avi_infoframe *frame, - void *buffer) + const void *buffer) { - u8 *ptr = buffer; + const u8 *ptr = buffer; int ret; if (ptr[0] != HDMI_INFOFRAME_TYPE_AVI || @@ -1079,9 +1079,9 @@ static int hdmi_avi_infoframe_unpack(struct hdmi_avi_infoframe *frame, * Returns 0 on success or a negative error code on failure. */ static int hdmi_spd_infoframe_unpack(struct hdmi_spd_infoframe *frame, - void *buffer) + const void *buffer) { - u8 *ptr = buffer; + const u8 *ptr = buffer; int ret; if (ptr[0] != HDMI_INFOFRAME_TYPE_SPD || @@ -1117,9 +1117,9 @@ static int hdmi_spd_infoframe_unpack(struct hdmi_spd_infoframe *frame, * Returns 0 on success or a negative error code on failure. */ static int hdmi_audio_infoframe_unpack(struct hdmi_audio_infoframe *frame, - void *buffer) + const void *buffer) { - u8 *ptr = buffer; + const u8 *ptr = buffer; int ret; if (ptr[0] != HDMI_INFOFRAME_TYPE_AUDIO || @@ -1163,9 +1163,9 @@ static int hdmi_audio_infoframe_unpack(struct hdmi_audio_infoframe *frame, */ static int hdmi_vendor_any_infoframe_unpack(union hdmi_vendor_any_infoframe *frame, - void *buffer) + const void *buffer) { - u8 *ptr = buffer; + const u8 *ptr = buffer; size_t length; int ret; u8 hdmi_video_format; @@ -1234,10 +1234,11 @@ hdmi_vendor_any_infoframe_unpack(union hdmi_vendor_any_infoframe *frame, * * Returns 0 on success or a negative error code on failure. */ -int hdmi_infoframe_unpack(union hdmi_infoframe *frame, void *buffer) +int hdmi_infoframe_unpack(union hdmi_infoframe *frame, + const void *buffer) { int ret; - u8 *ptr = buffer; + const u8 *ptr = buffer; switch (ptr[0]) { case HDMI_INFOFRAME_TYPE_AVI: diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h index d271ff23984f..d3816170c062 100644 --- a/include/linux/hdmi.h +++ b/include/linux/hdmi.h @@ -332,7 +332,8 @@ union hdmi_infoframe { ssize_t hdmi_infoframe_pack(union hdmi_infoframe *frame, void *buffer, size_t size); -int hdmi_infoframe_unpack(union hdmi_infoframe *frame, void *buffer); +int hdmi_infoframe_unpack(union hdmi_infoframe *frame, + const void *buffer); void hdmi_infoframe_log(const char *level, struct device *dev, union hdmi_infoframe *frame);