- greybus-dev - lists.linaro.org

[PATCH 00/13] Convert all users of strlcpy to strscpy

by Kumar Kartikeya Dwivedi

This series converts all existing users of strlcpy in drivers/staging to use strscpy instead. strlcpy is marked as deprecated in Documentation/process/deprecated.rst, and there is no functional difference when the caller expects truncation (when not checking the return value). strscpy is relatively better as it also avoids scanning the whole source string. This silences the related checkpatch warnings from: 5dbdb2d87c29 ("checkpatch: prefer strscpy to strlcpy") The conversions were performed in two steps: 1. The following coccinelle script was used to identify and replace call sites that expect truncation. $ spatch --sp-file strscpy.cocci --include-headers --dir --in-place drivers/staging @strscpy@ expression dest, src, size; @@ -strlcpy(dest, src, size); +strscpy(dest, src, size); 2. Each individual automated conversion was rechecked manually for correctness. Kumar Kartikeya Dwivedi (13): staging: comedi: Switch from strlcpy to strscpy staging: greybus: Switch from strlcpy to strscpy staging: fsl-dpaa2: Switch from strlcpy to strscpy staging: most: Switch from strlcpy to strscpy staging: nvec: Switch from strlcpy to strscpy staging: octeon: Switch from strlcpy to strscpy staging: olpc_dcon: Switch from strlcpy to strscpy staging: rtl8188eu: Switch from strlcpy to strscpy staging: rtl8192e: Switch from strlcpy to strscpy staging: rtl8192u: Switch from strlcpy to strscpy staging: rtl8712: Switch from strlcpy to strscpy staging: sm750fb: Switch from strlcpy to strscpy staging: wimax: Switch from strlcpy to strscpy drivers/staging/comedi/comedi_fops.c | 4 ++-- drivers/staging/fsl-dpaa2/ethsw/ethsw-ethtool.c | 6 +++--- drivers/staging/greybus/audio_helper.c | 2 +- drivers/staging/greybus/audio_module.c | 2 +- drivers/staging/greybus/audio_topology.c | 6 +++--- drivers/staging/greybus/power_supply.c | 2 +- drivers/staging/greybus/spilib.c | 4 ++-- drivers/staging/most/sound/sound.c | 2 +- drivers/staging/most/video/video.c | 6 +++--- drivers/staging/nvec/nvec_ps2.c | 4 ++-- drivers/staging/octeon/ethernet-mdio.c | 6 +++--- drivers/staging/olpc_dcon/olpc_dcon.c | 2 +- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c | 6 +++--- drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c | 2 +- drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2 +- drivers/staging/sm750fb/sm750.c | 2 +- drivers/staging/wimax/i2400m/netdev.c | 6 +++--- drivers/staging/wimax/i2400m/usb.c | 4 ++-- 19 files changed, 35 insertions(+), 35 deletions(-) -- 2.29.2

3 years, 4 months

3
18
0 0

[PATCH] checkpatch: fix coding style of macro: gb_loopback_stats_attrs

by Du Cheng

Wrap the multi-line definition inside a do {} while(0) block, in compliance to scripts/checkpatch.pl. Signed-off-by: Du Cheng <ducheng2(a)gmail.com> --- drivers/staging/greybus/loopback.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c index 2471448ba42a..9ae154908ec6 100644 --- a/drivers/staging/greybus/loopback.c +++ b/drivers/staging/greybus/loopback.c @@ -163,9 +163,11 @@ static ssize_t name##_avg_show(struct device *dev, \ static DEVICE_ATTR_RO(name##_avg) #define gb_loopback_stats_attrs(field) \ +do { \ gb_loopback_ro_stats_attr(field, min, u); \ gb_loopback_ro_stats_attr(field, max, u); \ - gb_loopback_ro_avg_attr(field) + gb_loopback_ro_avg_attr(field); \ +} while (0) #define gb_loopback_attr(field, type) \ static ssize_t field##_show(struct device *dev, \ -- 2.27.0

3 years, 4 months

2
1
0 0

[PATCH 1/1] staging: greybus: Added do - while in multi statement macro

by Hemansh Agnihotri

This patch add fixes an checkpatch error for "Macros with multiple statements should be enclosed in a do - while loop" Signed-off-by: Hemansh Agnihotri <hemanshagnihotri27(a)gmail.com> --- drivers/staging/greybus/loopback.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c index 2471448ba42a..6dd95d648999 100644 --- a/drivers/staging/greybus/loopback.c +++ b/drivers/staging/greybus/loopback.c @@ -162,10 +162,11 @@ static ssize_t name##_avg_show(struct device *dev, \ } \ static DEVICE_ATTR_RO(name##_avg) -#define gb_loopback_stats_attrs(field) \ +#define gb_loopback_stats_attrs(field) do { \ gb_loopback_ro_stats_attr(field, min, u); \ gb_loopback_ro_stats_attr(field, max, u); \ - gb_loopback_ro_avg_attr(field) + gb_loopback_ro_avg_attr(field); \ + } while (0) #define gb_loopback_attr(field, type) \ static ssize_t field##_show(struct device *dev, \ -- 2.30.0

3 years, 4 months

5
4
0 0

[PATCH 2/2] staging: greybus: Fixed a misspelling in hid.c

by Pritthijit Nath

Fixed the spelling of 'transfered' to 'transferred'. Signed-off-by: Pritthijit Nath <pritthijit.nath(a)icloud.com> --- Fixed the typo in 'transferred' which crept in last time. drivers/staging/greybus/hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/greybus/hid.c b/drivers/staging/greybus/hid.c index a56c3fb5d35a..adb91286803a 100644 --- a/drivers/staging/greybus/hid.c +++ b/drivers/staging/greybus/hid.c @@ -254,7 +254,7 @@ static int __gb_hid_output_raw_report(struct hid_device *hid, __u8 *buf, ret = gb_hid_set_report(ghid, report_type, report_id, buf, len); if (report_id && ret >= 0) - ret++; /* add report_id to the number of transfered bytes */ + ret++; /* add report_id to the number of transferred bytes */ return 0; } -- 2.25.1

3 years, 4 months

1
0
0 0

[PATCH 1/2] staging: greybus: Fixed alignment issue in hid.c

by Pritthijit Nath

This change fixes a checkpatch CHECK style issue for "Alignment should match open parenthesis". Signed-off-by: Pritthijit Nath <pritthijit.nath(a)icloud.com> --- drivers/staging/greybus/hid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/greybus/hid.c b/drivers/staging/greybus/hid.c index ed706f39e87a..a56c3fb5d35a 100644 --- a/drivers/staging/greybus/hid.c +++ b/drivers/staging/greybus/hid.c @@ -221,8 +221,8 @@ static void gb_hid_init_reports(struct gb_hid *ghid) } static int __gb_hid_get_raw_report(struct hid_device *hid, - unsigned char report_number, __u8 *buf, size_t count, - unsigned char report_type) + unsigned char report_number, __u8 *buf, size_t count, + unsigned char report_type) { struct gb_hid *ghid = hid->driver_data; int ret; -- 2.25.1

3 years, 4 months

4
11
0 0

[PATCH 2/2] staging: greybus: Fixed a misspelling in hid.c

by Pritthijit Nath

Fixed the spelling of 'transfered' to 'transferred'. Signed-off-by: Pritthijit Nath <pritthijit.nath(a)icloud.com> --- Fixed the typo in the patch which was meant to fix that very typo. Really sorry for last time. Hope this does not have any other typo. drivers/staging/greybus/hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/greybus/hid.c b/drivers/staging/greybus/hid.c index a56c3fb5d35a..adb91286803a 100644 --- a/drivers/staging/greybus/hid.c +++ b/drivers/staging/greybus/hid.c @@ -254,7 +254,7 @@ static int __gb_hid_output_raw_report(struct hid_device *hid, __u8 *buf, ret = gb_hid_set_report(ghid, report_type, report_id, buf, len); if (report_id && ret >= 0) - ret++; /* add report_id to the number of transfered bytes */ + ret++; /* add report_id to the number of transferred bytes */ return 0; } -- 2.25.1

3 years, 4 months

2
1
0 0

[PATCH] staging: greybus: Fixed misspelling and alignment issue in hid.c

by Pritthijit Nath

This change fixes a checkpatch CHECK style issue for "Alignment should match open parenthesis". In addition the misspelling of "transferred" also has been fixed. Signed-off-by: Pritthijit Nath <pritthijit.nath(a)icloud.com> --- drivers/staging/greybus/hid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/greybus/hid.c b/drivers/staging/greybus/hid.c index ed706f39e87a..adb91286803a 100644 --- a/drivers/staging/greybus/hid.c +++ b/drivers/staging/greybus/hid.c @@ -221,8 +221,8 @@ static void gb_hid_init_reports(struct gb_hid *ghid) } static int __gb_hid_get_raw_report(struct hid_device *hid, - unsigned char report_number, __u8 *buf, size_t count, - unsigned char report_type) + unsigned char report_number, __u8 *buf, size_t count, + unsigned char report_type) { struct gb_hid *ghid = hid->driver_data; int ret; @@ -254,7 +254,7 @@ static int __gb_hid_output_raw_report(struct hid_device *hid, __u8 *buf, ret = gb_hid_set_report(ghid, report_type, report_id, buf, len); if (report_id && ret >= 0) - ret++; /* add report_id to the number of transfered bytes */ + ret++; /* add report_id to the number of transferred bytes */ return 0; } -- 2.25.1

3 years, 4 months

2
1
0 0

[PATCH 0/1] Coding style fix

by Fatih YILDIRIM

Hi, I have a coding style fix in greybus subsystem. By the way, I'm following the Eudyptula Challenge Linux kernel tasks and this patch is related to my task no 10. I hope I'm doing it the right way. Thanks for your understanding and kind comments. Fatih YILDIRIM (1): Macros with multiple statements should be enclosed in a do - while loop. drivers/staging/greybus/loopback.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.20.1

3 years, 4 months

3
3
0 0

[PATCH 1/2] staging: greybus: vibrator: use proper API for vibrator devices

by Greg Kroah-Hartman

The correct user/kernel api for vibrator devices is the Input rumble api, not a random sysfs file like the greybus vibrator driver currently uses. Add support for the correct input api to the vibrator driver so that it hooks up to the kernel and userspace correctly. Cc: Johan Hovold <johan(a)kernel.org> Cc: Alex Elder <elder(a)kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- drivers/staging/greybus/vibrator.c | 59 ++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/drivers/staging/greybus/vibrator.c b/drivers/staging/greybus/vibrator.c index 0e2b188e5ca3..94110cadb5bd 100644 --- a/drivers/staging/greybus/vibrator.c +++ b/drivers/staging/greybus/vibrator.c @@ -13,13 +13,18 @@ #include <linux/kdev_t.h> #include <linux/idr.h> #include <linux/pm_runtime.h> +#include <linux/input.h> #include <linux/greybus.h> struct gb_vibrator_device { struct gb_connection *connection; + struct input_dev *input; struct device *dev; int minor; /* vibrator minor number */ struct delayed_work delayed_work; + bool running; + bool on; + struct work_struct play_work; }; /* Greybus Vibrator operation types */ @@ -36,6 +41,7 @@ static int turn_off(struct gb_vibrator_device *vib) gb_pm_runtime_put_autosuspend(bundle); + vib->on = false; return ret; } @@ -59,11 +65,48 @@ static int turn_on(struct gb_vibrator_device *vib, u16 timeout_ms) return ret; } + vib->on = true; schedule_delayed_work(&vib->delayed_work, msecs_to_jiffies(timeout_ms)); return 0; } +static void gb_vibrator_play_work(struct work_struct *work) +{ + struct gb_vibrator_device *vib = + container_of(work, struct gb_vibrator_device, play_work); + + if (vib->running) + turn_off(vib); + else + turn_on(vib, 100); +} + +static int gb_vibrator_play_effect(struct input_dev *input, void *data, + struct ff_effect *effect) +{ + struct gb_vibrator_device *vib = input_get_drvdata(input); + int level; + + level = effect->u.rumble.strong_magnitude; + if (!level) + level = effect->u.rumble.weak_magnitude; + + vib->running = level; + schedule_work(&vib->play_work); + return 0; +} + +static void gb_vibrator_close(struct input_dev *input) +{ + struct gb_vibrator_device *vib = input_get_drvdata(input); + + cancel_delayed_work_sync(&vib->delayed_work); + cancel_work_sync(&vib->play_work); + turn_off(vib); + vib->running = false; +} + static void gb_vibrator_worker(struct work_struct *work) { struct delayed_work *delayed_work = to_delayed_work(work); @@ -169,10 +212,26 @@ static int gb_vibrator_probe(struct gb_bundle *bundle, INIT_DELAYED_WORK(&vib->delayed_work, gb_vibrator_worker); + INIT_WORK(&vib->play_work, gb_vibrator_play_work); + vib->input->name = "greybus-vibrator"; + vib->input->close = gb_vibrator_close; + vib->input->dev.parent = &bundle->dev; + vib->input->id.bustype = BUS_HOST; + + input_set_drvdata(vib->input, vib); + input_set_capability(vib->input, EV_FF, FF_RUMBLE); + + retval = input_ff_create_memless(vib->input, NULL, + gb_vibrator_play_effect); + if (retval) + goto err_device_remove; + gb_pm_runtime_put_autosuspend(bundle); return 0; +err_device_remove: + device_unregister(vib->dev); err_ida_remove: ida_simple_remove(&minors, vib->minor); err_connection_disable: -- 2.30.0

3 years, 5 months

3
5
0 0

[PATCH] staging: greybus: audio_helper.c: Replace strlcpy() with strscpy()

by B K Karthik

In gbaudio_remove_controls() , replace the usage of strlcpy() with strscpy() because strlcpy() only limits the *destination* size, and the source is always read fully. https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmk… was quoted by checkpatch while showing this warning. Signed-off-by: B K Karthik <bkkarthik(a)pesu.pes.edu> --- drivers/staging/greybus/audio_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/greybus/audio_helper.c b/drivers/staging/greybus/audio_helper.c index 3011b8abce38..1ed4772d2771 100644 --- a/drivers/staging/greybus/audio_helper.c +++ b/drivers/staging/greybus/audio_helper.c @@ -166,7 +166,7 @@ static int gbaudio_remove_controls(struct snd_card *card, struct device *dev, snprintf(id.name, sizeof(id.name), "%s %s", prefix, control->name); else - strlcpy(id.name, control->name, sizeof(id.name)); + strscpy(id.name, control->name, sizeof(id.name)); id.numid = 0; id.iface = control->iface; id.device = control->device; -- 2.17.1

3 years, 5 months

2
1
0 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

greybus-dev