[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20191023102207.GB4763@pendragon.ideasonboard.com>
Date: Wed, 23 Oct 2019 13:22:07 +0300
From: Laurent Pinchart <laurent.pinchart@...asonboard.com>
To: Mark Salyzyn <salyzyn@...roid.com>
Cc: linux-kernel@...r.kernel.org, kernel-team@...roid.com,
"David S. Miller" <davem@...emloft.net>,
Jonathan Corbet <corbet@....net>,
Ard Biesheuvel <ard.biesheuvel@...aro.org>,
Harry Wentland <harry.wentland@....com>,
Leo Li <sunpeng.li@....com>,
Alex Deucher <alexander.deucher@....com>,
Christian König <christian.koenig@....com>,
"David (ChunMing) Zhou" <David1.Zhou@....com>,
David Airlie <airlied@...ux.ie>,
Daniel Vetter <daniel@...ll.ch>,
VMware Graphics <linux-graphics-maintainer@...are.com>,
Thomas Hellstrom <thellstrom@...are.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Trond Myklebust <trond.myklebust@...merspace.com>,
Anna Schumaker <anna.schumaker@...app.com>,
Alexander Aring <alex.aring@...il.com>,
Jukka Rissanen <jukka.rissanen@...ux.intel.com>,
Alexey Kuznetsov <kuznet@....inr.ac.ru>,
Hideaki YOSHIFUJI <yoshfuji@...ux-ipv6.org>,
Jarkko Sakkinen <jarkko.sakkinen@...ux.intel.com>,
Ingo Molnar <mingo@...nel.org>,
Matthew Garrett <matthewgarrett@...gle.com>,
Hans de Goede <hdegoede@...hat.com>,
hersen wu <hersenxs.wu@....com>, Roman Li <Roman.Li@....com>,
Maxim Martynov <maxim@...sta.com>,
David Ahern <dsahern@...il.com>,
Francesco Ruggeri <fruggeri@...sta.com>,
Linus Lüssing <linus.luessing@...3.blue>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Feng Tang <feng.tang@...el.com>,
"Steven Rostedt (VMware)" <rostedt@...dmis.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Rafael Aquini <aquini@...hat.com>, netdev@...r.kernel.org,
linux-doc@...r.kernel.org, linux-efi@...r.kernel.org,
amd-gfx@...ts.freedesktop.org, dri-devel@...ts.freedesktop.org,
linux-media@...r.kernel.org, linux-nfs@...r.kernel.org,
linux-bluetooth@...r.kernel.org, linux-wpan@...r.kernel.org
Subject: Re: [PATCH] Cleanup: replace prefered with preferred
Hi Mark,
Thank you for the patch.
On Tue, Oct 22, 2019 at 02:41:45PM -0700, Mark Salyzyn wrote:
> Replace all occurrences of prefered with preferred to make future
> checkpatch.pl's happy. A few places the incorrect spelling is
> matched with the correct spelling to preserve existing user space API.
>
> Signed-off-by: Mark Salyzyn <salyzyn@...roid.com>
> ---
> Documentation/networking/ip-sysctl.txt | 2 +-
> .../firmware/efi/libstub/efi-stub-helper.c | 2 +-
> .../gpu/drm/amd/display/dc/inc/compressor.h | 4 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 +-
> drivers/media/usb/uvc/uvc_video.c | 6 +-
> fs/nfs/nfs4xdr.c | 2 +-
> include/linux/ipv6.h | 2 +-
> include/net/addrconf.h | 4 +-
> include/net/if_inet6.h | 2 +-
> include/net/ndisc.h | 8 +-
> include/uapi/linux/if_addr.h | 5 +-
> include/uapi/linux/ipv6.h | 4 +-
> include/uapi/linux/sysctl.h | 4 +-
> include/uapi/linux/usb/video.h | 5 +-
> kernel/sysctl_binary.c | 3 +-
> net/6lowpan/ndisc.c | 4 +-
> net/ipv4/devinet.c | 20 ++--
> net/ipv6/addrconf.c | 113 ++++++++++--------
> 19 files changed, 112 insertions(+), 82 deletions(-)
[snip]
> diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
> index 8fa77a81dd7f..0096e6aacdb4 100644
> --- a/drivers/media/usb/uvc/uvc_video.c
> +++ b/drivers/media/usb/uvc/uvc_video.c
> @@ -276,13 +276,13 @@ static int uvc_get_video_ctrl(struct uvc_streaming *stream,
> if (size >= 34) {
> ctrl->dwClockFrequency = get_unaligned_le32(&data[26]);
> ctrl->bmFramingInfo = data[30];
> - ctrl->bPreferedVersion = data[31];
> + ctrl->bPreferredVersion = data[31];
> ctrl->bMinVersion = data[32];
> ctrl->bMaxVersion = data[33];
> } else {
> ctrl->dwClockFrequency = stream->dev->clock_frequency;
> ctrl->bmFramingInfo = 0;
> - ctrl->bPreferedVersion = 0;
> + ctrl->bPreferredVersion = 0;
> ctrl->bMinVersion = 0;
> ctrl->bMaxVersion = 0;
> }
> @@ -325,7 +325,7 @@ static int uvc_set_video_ctrl(struct uvc_streaming *stream,
> if (size >= 34) {
> put_unaligned_le32(ctrl->dwClockFrequency, &data[26]);
> data[30] = ctrl->bmFramingInfo;
> - data[31] = ctrl->bPreferedVersion;
> + data[31] = ctrl->bPreferredVersion;
> data[32] = ctrl->bMinVersion;
> data[33] = ctrl->bMaxVersion;
> }
[snip]
> diff --git a/include/uapi/linux/usb/video.h b/include/uapi/linux/usb/video.h
> index d854cb19c42c..59167f0ed5c1 100644
> --- a/include/uapi/linux/usb/video.h
> +++ b/include/uapi/linux/usb/video.h
> @@ -448,7 +448,10 @@ struct uvc_streaming_control {
> __u32 dwMaxPayloadTransferSize;
> __u32 dwClockFrequency;
> __u8 bmFramingInfo;
> - __u8 bPreferedVersion;
> + union {
> + __u8 bPreferredVersion;
> + __u8 bPreferedVersion __attribute__((deprecated)); /* NOTYPO */
> + } __attribute__((__packed__));
Quite interestingly this typo is part of the USB device class definition
for video devices (UVC) specification. I thus think we should keep using
the field name bPreferedVersion through the code, otherwise it wouldn't
match the spec.
> __u8 bMinVersion;
> __u8 bMaxVersion;
> } __attribute__((__packed__));
[snip]
--
Regards,
Laurent Pinchart
Powered by blists - more mailing lists