diff mbox

drivers/hid/wacom: fixed coding style issues

Message ID 20140121224203.GA12427@fedora.fritz.box (mailing list archive)
State New, archived
Delegated to: Jiri Kosina
Headers show

Commit Message

Robin Schroer Jan. 21, 2014, 10:42 p.m. UTC
On Tue, Jan 21, 2014 at 01:25:54PM -0800, Joe Perches wrote:
> On Tue, 2014-01-21 at 13:18 -0800, Dmitry Torokhov wrote:
> > On Tue, Jan 21, 2014 at 09:29:44PM +0100, Rob Schroer wrote:
> > > As far as I can see, kstrtoXXX() might be an alternative, but I was just
> > > fixing coding style issues, no need to break anything IMO.
> > 
> > You could do the breaking in a follow up patch ;)
> 
> Yes please.
> 
> Include the breaking of multiple statements
> into multiple lines too please like
> 
> from:
> 	case USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH:
> 		rep_data[0] = 0x03; rep_data[1] = 0x00;
> 
> to:
> 	case USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH:
> 		rep_data[0] = 0x03;
> 		rep_data[1] = 0x00;
> 
> 

Added a cosmetical linebreak, switched an occurence of sscanf to kstrtoint.

Signed-off-by: Robin Schroer <sulamiification@gmail.com>
---
 drivers/hid/hid-wacom.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--
1.8.4.2

Well, I hope this works as intended.

--
Robin
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Dmitry Torokhov Jan. 22, 2014, 6:40 a.m. UTC | #1
On Tue, Jan 21, 2014 at 11:42:03PM +0100, Rob Schroer wrote:
> On Tue, Jan 21, 2014 at 01:25:54PM -0800, Joe Perches wrote:
> > On Tue, 2014-01-21 at 13:18 -0800, Dmitry Torokhov wrote:
> > > On Tue, Jan 21, 2014 at 09:29:44PM +0100, Rob Schroer wrote:
> > > > As far as I can see, kstrtoXXX() might be an alternative, but I was just
> > > > fixing coding style issues, no need to break anything IMO.
> > > 
> > > You could do the breaking in a follow up patch ;)
> > 
> > Yes please.
> > 
> > Include the breaking of multiple statements
> > into multiple lines too please like
> > 
> > from:
> > 	case USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH:
> > 		rep_data[0] = 0x03; rep_data[1] = 0x00;
> > 
> > to:
> > 	case USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH:
> > 		rep_data[0] = 0x03;
> > 		rep_data[1] = 0x00;
> > 
> > 
> 
> Added a cosmetical linebreak, switched an occurence of sscanf to kstrtoint.
> 
> Signed-off-by: Robin Schroer <sulamiification@gmail.com>
> ---
>  drivers/hid/hid-wacom.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
> index ebcca0d..5daf80c 100644
> --- a/drivers/hid/hid-wacom.c
> +++ b/drivers/hid/hid-wacom.c
> @@ -336,7 +336,8 @@ static void wacom_set_features(struct hid_device *hdev, u8 speed)
> 
>  	switch (hdev->product) {
>  	case USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH:
> -		rep_data[0] = 0x03; rep_data[1] = 0x00;
> +		rep_data[0] = 0x03;
> +		rep_data[1] = 0x00;
>  		limit = 3;
>  		do {
>  			ret = hdev->hid_output_raw_report(hdev, rep_data, 2,
> @@ -404,7 +405,7 @@ static ssize_t wacom_store_speed(struct device *dev,
>  	struct hid_device *hdev = container_of(dev, struct hid_device, dev);
>  	int new_speed;
> 
> -	if (sscanf(buf, "%1d", &new_speed) != 1)
> +	if (kstrtoint(buf, 10, &new_speed))
>  		return -EINVAL;

I think this should be

	error = kstrtoint(buf, 10, &new_speed);
	if (error)
		return error;

> 
>  	if (new_speed == 0 || new_speed == 1) {
> --
> 1.8.4.2
> 
> Well, I hope this works as intended.
> 
> --
> Robin
diff mbox

Patch

diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index ebcca0d..5daf80c 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -336,7 +336,8 @@  static void wacom_set_features(struct hid_device *hdev, u8 speed)

 	switch (hdev->product) {
 	case USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH:
-		rep_data[0] = 0x03; rep_data[1] = 0x00;
+		rep_data[0] = 0x03;
+		rep_data[1] = 0x00;
 		limit = 3;
 		do {
 			ret = hdev->hid_output_raw_report(hdev, rep_data, 2,
@@ -404,7 +405,7 @@  static ssize_t wacom_store_speed(struct device *dev,
 	struct hid_device *hdev = container_of(dev, struct hid_device, dev);
 	int new_speed;

-	if (sscanf(buf, "%1d", &new_speed) != 1)
+	if (kstrtoint(buf, 10, &new_speed))
 		return -EINVAL;

 	if (new_speed == 0 || new_speed == 1) {