hid: roccat: Fix code style issues

hid: roccat: Fix code style issues

[hans.duedal]

From: Hans Duedal <hans.duedal@gmail.com>

Missing whitespace, semi-colon after macro, and a duplicated out of
memory message.

Signed-off-by: Hans Duedal <hans.duedal@gmail.com>
---
 drivers/hid/hid-roccat-kone.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c
index 6101816..c292650 100644
--- a/drivers/hid/hid-roccat-kone.c
+++ b/drivers/hid/hid-roccat-kone.c
@@ -46,6 +46,7 @@ static void kone_profile_activated(struct kone_device *kone, uint new_profile)
 static void kone_profile_report(struct kone_device *kone, uint new_profile)
 {
 	struct kone_roccat_report roccat_report;
+
 	roccat_report.event = kone_mouse_event_switch_profile;
 	roccat_report.value = new_profile;
 	roccat_report.key = 0;
@@ -163,6 +164,7 @@ static int kone_set_settings(struct usb_device *usb_dev,
 		struct kone_settings const *settings)
 {
 	int retval;
+
 	retval = kone_send(usb_dev, kone_command_settings,
 			settings, sizeof(struct kone_settings));
 	if (retval)
@@ -387,7 +389,7 @@ static struct bin_attribute bin_attr_profile##number = {	\
 	.read = kone_sysfs_read_profilex,			\
 	.write = kone_sysfs_write_profilex,			\
 	.private = &profile_numbers[number-1],			\
-};
+}
 PROFILE_ATTR(1);
 PROFILE_ATTR(2);
 PROFILE_ATTR(3);
@@ -456,6 +458,7 @@ static ssize_t kone_sysfs_show_tcu(struct device *dev,
 static int kone_tcu_command(struct usb_device *usb_dev, int number)
 {
 	unsigned char value;
+
 	value = number;
 	return kone_send(usb_dev, kone_command_calibrate, &value, 1);
 }
@@ -697,10 +700,8 @@ static int kone_init_specials(struct hid_device *hdev)
 			== USB_INTERFACE_PROTOCOL_MOUSE) {

 		kone = kzalloc(sizeof(*kone), GFP_KERNEL);
-		if (!kone) {
-			hid_err(hdev, "can't alloc device descriptor\n");
+		if (!kone)
 			return -ENOMEM;
-		}
 		hid_set_drvdata(hdev, kone);

 		retval = kone_init_kone_device_struct(usb_dev, kone);
--
1.9.3 (Apple Git-50)

Re: hid: roccat: Fix code style issues

[Jiri Kosina]

On Sat, 11 Oct 2014, hans.duedal@gmail.com wrote:

> From: Hans Duedal <hans.duedal@gmail.com>
> 
> Missing whitespace, semi-colon after macro, and a duplicated out of
> memory message.
> 
> Signed-off-by: Hans Duedal <hans.duedal@gmail.com>

Applied, thanks.

> ---
>  drivers/hid/hid-roccat-kone.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c
> index 6101816..c292650 100644
> --- a/drivers/hid/hid-roccat-kone.c
> +++ b/drivers/hid/hid-roccat-kone.c
> @@ -46,6 +46,7 @@ static void kone_profile_activated(struct kone_device *kone, uint new_profile)
>  static void kone_profile_report(struct kone_device *kone, uint new_profile)
>  {
>  	struct kone_roccat_report roccat_report;
> +
>  	roccat_report.event = kone_mouse_event_switch_profile;
>  	roccat_report.value = new_profile;
>  	roccat_report.key = 0;
> @@ -163,6 +164,7 @@ static int kone_set_settings(struct usb_device *usb_dev,
>  		struct kone_settings const *settings)
>  {
>  	int retval;
> +
>  	retval = kone_send(usb_dev, kone_command_settings,
>  			settings, sizeof(struct kone_settings));
>  	if (retval)
> @@ -387,7 +389,7 @@ static struct bin_attribute bin_attr_profile##number = {	\
>  	.read = kone_sysfs_read_profilex,			\
>  	.write = kone_sysfs_write_profilex,			\
>  	.private = &profile_numbers[number-1],			\
> -};
> +}
>  PROFILE_ATTR(1);
>  PROFILE_ATTR(2);
>  PROFILE_ATTR(3);
> @@ -456,6 +458,7 @@ static ssize_t kone_sysfs_show_tcu(struct device *dev,
>  static int kone_tcu_command(struct usb_device *usb_dev, int number)
>  {
>  	unsigned char value;
> +
>  	value = number;
>  	return kone_send(usb_dev, kone_command_calibrate, &value, 1);
>  }
> @@ -697,10 +700,8 @@ static int kone_init_specials(struct hid_device *hdev)
>  			== USB_INTERFACE_PROTOCOL_MOUSE) {
> 
>  		kone = kzalloc(sizeof(*kone), GFP_KERNEL);
> -		if (!kone) {
> -			hid_err(hdev, "can't alloc device descriptor\n");
> +		if (!kone)
>  			return -ENOMEM;
> -		}
>  		hid_set_drvdata(hdev, kone);
> 
>  		retval = kone_init_kone_device_struct(usb_dev, kone);
> --
> 1.9.3 (Apple Git-50)
> 

-- 
Jiri Kosina
SUSE Labs