linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] input synaptics-rmi4 trivial: rmi_f01.c tidy-up
@ 2013-12-31  3:10 Christopher Heiny
  2013-12-31 18:44 ` Dmitry Torokhov
  0 siblings, 1 reply; 4+ messages in thread
From: Christopher Heiny @ 2013-12-31  3:10 UTC (permalink / raw)
  To: Dmitry Torokhov
  Cc: Linux Input, Christopher Heiny, Andrew Duggan, Vincent Huang,
	Vivian Ly, Daniel Rosenberg, Jean Delvare, Joerie de Gram,
	Linus Walleij, Benjamin Tissoires

This has two trivial changes:

1) make sure spacing around operators is correct.

2) capitalize Synaptics appropriately.

Signed-off-by: Christopher Heiny <cheiny@synaptics.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>

---

 drivers/input/rmi4/rmi_f01.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c
index 840a8d0..628b082 100644
--- a/drivers/input/rmi4/rmi_f01.c
+++ b/drivers/input/rmi4/rmi_f01.c
@@ -156,7 +156,7 @@ static int rmi_f01_alloc_memory(struct rmi_function *fn,
 	}
 
 	f01->device_control.interrupt_enable = devm_kzalloc(&fn->dev,
-			sizeof(u8)*(num_of_irq_regs),
+			sizeof(u8) * (num_of_irq_regs),
 			GFP_KERNEL);
 	if (!f01->device_control.interrupt_enable) {
 		dev_err(&fn->dev, "Failed to allocate interrupt enable.\n");
@@ -280,7 +280,7 @@ static int rmi_f01_initialize(struct rmi_function *fn)
 
 	dev_info(&fn->dev, "found RMI device, manufacturer: %s, product: %s\n",
 		 data->properties.manufacturer_id == 1 ?
-							"synaptics" : "unknown",
+							"Synaptics" : "unknown",
 		 data->properties.product_id);
 
 	/* read control register */

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] input synaptics-rmi4 trivial: rmi_f01.c tidy-up
  2013-12-31  3:10 Christopher Heiny
@ 2013-12-31 18:44 ` Dmitry Torokhov
  0 siblings, 0 replies; 4+ messages in thread
From: Dmitry Torokhov @ 2013-12-31 18:44 UTC (permalink / raw)
  To: Christopher Heiny
  Cc: Linux Input, Andrew Duggan, Vincent Huang, Vivian Ly,
	Daniel Rosenberg, Jean Delvare, Joerie de Gram, Linus Walleij,
	Benjamin Tissoires

On Mon, Dec 30, 2013 at 07:10:56PM -0800, Christopher Heiny wrote:
> This has two trivial changes:
> 
> 1) make sure spacing around operators is correct.
> 
> 2) capitalize Synaptics appropriately.
> 
> Signed-off-by: Christopher Heiny <cheiny@synaptics.com>

Applied, thank you.

-- 
Dmitry

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] input synaptics-rmi4 trivial: rmi_f01.c tidy-up
@ 2014-01-08  0:07 Christopher Heiny
  2014-01-09  8:11 ` Dmitry Torokhov
  0 siblings, 1 reply; 4+ messages in thread
From: Christopher Heiny @ 2014-01-08  0:07 UTC (permalink / raw)
  To: Dmitry Torokhov
  Cc: Linux Input, Christopher Heiny, Andrew Duggan, Vincent Huang,
	Vivian Ly, Daniel Rosenberg, Jean Delvare, Joerie de Gram,
	Linus Walleij, Benjamin Tissoires

This has two trivial changes:

1) use CONFIG_PM_SLEEP instead of CONFIG_PM for consistency.

2) Update the copyright date.

Signed-off-by: Christopher Heiny <cheiny@synaptics.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>

---
 drivers/input/rmi4/rmi_f01.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c
index 628b082..d547633 100644
--- a/drivers/input/rmi4/rmi_f01.c
+++ b/drivers/input/rmi4/rmi_f01.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2012 Synaptics Incorporated
+ * Copyright (c) 2011-2014 Synaptics Incorporated
  * Copyright (c) 2011 Unixphere
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -138,7 +138,7 @@ struct f01_data {
 	int irq_count;
 	int num_of_irq_regs;
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 	bool suspended;
 	bool old_nosleep;
 #endif

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] input synaptics-rmi4 trivial: rmi_f01.c tidy-up
  2014-01-08  0:07 [PATCH] input synaptics-rmi4 trivial: rmi_f01.c tidy-up Christopher Heiny
@ 2014-01-09  8:11 ` Dmitry Torokhov
  0 siblings, 0 replies; 4+ messages in thread
From: Dmitry Torokhov @ 2014-01-09  8:11 UTC (permalink / raw)
  To: Christopher Heiny
  Cc: Linux Input, Andrew Duggan, Vincent Huang, Vivian Ly,
	Daniel Rosenberg, Jean Delvare, Joerie de Gram, Linus Walleij,
	Benjamin Tissoires

On Tue, Jan 07, 2014 at 04:07:42PM -0800, Christopher Heiny wrote:
> This has two trivial changes:
> 
> 1) use CONFIG_PM_SLEEP instead of CONFIG_PM for consistency.
> 
> 2) Update the copyright date.
> 
> Signed-off-by: Christopher Heiny <cheiny@synaptics.com>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>

Applied, thank you.

> 
> ---
>  drivers/input/rmi4/rmi_f01.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c
> index 628b082..d547633 100644
> --- a/drivers/input/rmi4/rmi_f01.c
> +++ b/drivers/input/rmi4/rmi_f01.c
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright (c) 2011-2012 Synaptics Incorporated
> + * Copyright (c) 2011-2014 Synaptics Incorporated
>   * Copyright (c) 2011 Unixphere
>   *
>   * This program is free software; you can redistribute it and/or modify it
> @@ -138,7 +138,7 @@ struct f01_data {
>  	int irq_count;
>  	int num_of_irq_regs;
>  
> -#ifdef CONFIG_PM
> +#ifdef CONFIG_PM_SLEEP
>  	bool suspended;
>  	bool old_nosleep;
>  #endif

-- 
Dmitry

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-01-09  8:11 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-08  0:07 [PATCH] input synaptics-rmi4 trivial: rmi_f01.c tidy-up Christopher Heiny
2014-01-09  8:11 ` Dmitry Torokhov
  -- strict thread matches above, loose matches on Subject: below --
2013-12-31  3:10 Christopher Heiny
2013-12-31 18:44 ` Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).