On Fri, Oct 27, 2017 at 11:07 AM, Jason Gerecke <killert...@gmail.com> wrote:
> A number of minor changes have either been unintentionally made to the
> 3.17 tree or occurred as a result of not backporting all upstream changes.
> These differences do not affect driver operation, but the clutter they
> produce in the output of `diff` does serve to hide a number of "real"
> semantic differences. They also make it more difficult to backport
> upstream patches, as the patch command will fail if the context does
> not exactly match.
>
> To resolve these issues, this commit pulls in as many trivial changes
> from 4.5 (which we assume is nearly-identical to upstream) as possible.
>
> Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
Acked-by: Ping Cheng <ping.cheng@wacom,com>, if you were waiting for one ;).
Cheers,
Ping
> ---
> 3.17/wacom_sys.c | 9 +++++----
> 3.17/wacom_wac.c | 7 +++----
> 3.17/wacom_wac.h | 1 +
> 3 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/3.17/wacom_sys.c b/3.17/wacom_sys.c
> index 7387bd2..6f395dc 100644
> --- a/3.17/wacom_sys.c
> +++ b/3.17/wacom_sys.c
> @@ -1444,7 +1444,7 @@ err:
> static int wacom_initialize_battery(struct wacom *wacom)
> {
> if (wacom->wacom_wac.features.quirks & WACOM_QUIRK_BATTERY)
> - return __wacom_initialize_battery(wacom, &wacom->battery);
> + return __wacom_initialize_battery(wacom, &wacom->battery);
>
> return 0;
> }
> @@ -2219,8 +2219,8 @@ static void wacom_remote_destroy_one(struct wacom
> *wacom, unsigned int index)
>
> #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
> if (WACOM_POWERSUPPLY_DEVICE(remote->remotes[index].battery.battery))
> - devres_release_group(&wacom->hdev->dev,
> -
> &remote->remotes[index].battery.bat_desc);
> + devres_release_group(&wacom->hdev->dev,
> +
> &remote->remotes[index].battery.bat_desc);
> #else
> if (remote->remotes[index].battery.battery.dev)
> wacom_destroy_remote_battery(&remote->remotes[index].battery);
> @@ -2307,6 +2307,7 @@ static int wacom_remote_attach_battery(struct wacom
> *wacom, int index)
> {
> struct wacom_remote *remote = wacom->remote;
> int error;
> +
> if (!remote->remotes[index].registered)
> return 0;
>
> @@ -2317,7 +2318,7 @@ static int wacom_remote_attach_battery(struct wacom
> *wacom, int index)
> return 0;
>
> error = __wacom_initialize_battery(wacom,
> -
> &wacom->remote->remotes[index].battery);
> +
> &wacom->remote->remotes[index].battery);
> if (error)
> return error;
>
> diff --git a/3.17/wacom_wac.c b/3.17/wacom_wac.c
> index dc83356..c2bf12b 100644
> --- a/3.17/wacom_wac.c
> +++ b/3.17/wacom_wac.c
> @@ -21,7 +21,7 @@
> #endif
>
> #ifndef KEY_ONSCREEN_KEYBOARD
> -#define KEY_ONSCREEN_KEYBOARD 0x278
> +#define KEY_ONSCREEN_KEYBOARD 0x278
> #endif
>
> #ifndef KEY_BUTTONCONFIG
> @@ -1095,7 +1095,6 @@ static int wacom_remote_irq(struct wacom_wac
> *wacom_wac, size_t len)
> WACOM_POWER_SUPPLY_STATUS_AUTO, bat_percent,
> bat_charging, 1, bat_charging);
>
> -
> out:
> spin_unlock_irqrestore(&remote->remote_lock, flags);
> return 0;
> @@ -1990,7 +1989,7 @@ static void wacom_wac_pad_event(struct hid_device
> *hdev, struct hid_field *field
> is_touch_on = wacom_wac->shared->is_touch_on;
> }
>
> - /* fall through*/
> + /* fall through*/
> case WACOM_HID_WD_TOUCHONOFF:
> if (wacom_wac->shared->touch_input) {
> input_report_switch(wacom_wac->shared->touch_input,
> @@ -2364,7 +2363,7 @@ static void wacom_wac_finger_slot(struct wacom_wac
> *wacom_wac,
> report_touch_events(wacom_wac);
>
> if (wacom_wac->shared->has_mute_touch_switch &&
> - !wacom_wac->shared->is_touch_on) {
> + !wacom_wac->shared->is_touch_on) {
> if (!wacom_wac->shared->touch_down)
> return;
> prox = 0;
> diff --git a/3.17/wacom_wac.h b/3.17/wacom_wac.h
> index 7b12d70..daf34f1 100644
> --- a/3.17/wacom_wac.h
> +++ b/3.17/wacom_wac.h
> @@ -361,6 +361,7 @@ struct wacom_wac {
> bool has_mute_touch_switch;
> bool has_mode_change;
> bool is_direct_mode;
> +
> };
>
> #endif
> --
> 2.14.3
>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
