diff mbox

[linux,v2,14/17] drivers/fsi: Fix some text formatting

Message ID 1475948333-55960-15-git-send-email-christopher.lee.bostic@gmail.com
State Changes Requested, archived
Headers show

Commit Message

christopher.lee.bostic@gmail.com Oct. 8, 2016, 5:38 p.m. UTC
From: Chris Bostic <cbostic@us.ibm.com>

Cleaned up a few formatting warnings like blank lines at EOF
and block comment style.

Signed-off-by: Chris Bostic <cbostic@us.ibm.com>
---
 drivers/fsi/fsi-core.c        | 8 ++++++--
 drivers/fsi/fsi-master-fake.c | 1 -
 drivers/fsi/fsi-master-gpio.c | 1 -
 3 files changed, 6 insertions(+), 4 deletions(-)

Comments

Jeremy Kerr Oct. 10, 2016, 2:51 a.m. UTC | #1
Hi Chris,

> Cleaned up a few formatting warnings like blank lines at EOF
> and block comment style.
> 
> Signed-off-by: Chris Bostic <cbostic@us.ibm.com>

This looks good to me. Do you want me to apply these as fixups to my
patches now, or do you want to carry this separately?

Note that we'll need to apply as fixup before sending upstream, so this
is just a matter of when would suit you best.

Cheers,


Jeremy
christopher.lee.bostic@gmail.com Oct. 10, 2016, 2:27 p.m. UTC | #2
On Sun, Oct 9, 2016 at 9:51 PM, Jeremy Kerr <jk@ozlabs.org> wrote:
> Hi Chris,
>
>> Cleaned up a few formatting warnings like blank lines at EOF
>> and block comment style.
>>
>> Signed-off-by: Chris Bostic <cbostic@us.ibm.com>
>
> This looks good to me. Do you want me to apply these as fixups to my
> patches now, or do you want to carry this separately?
>
> Note that we'll need to apply as fixup before sending upstream, so this
> is just a matter of when would suit you best.
>
Hi Jeremy,

I'd be fine with leaving it as it is here in this patch set.  Not
familiar with what fixups are in
this context.

-Chris

> Cheers,
>
>
> Jeremy
Jeremy Kerr Oct. 10, 2016, 3:46 p.m. UTC | #3
Hi Chris,

>> This looks good to me. Do you want me to apply these as fixups to my
>> patches now, or do you want to carry this separately?
>>
>> Note that we'll need to apply as fixup before sending upstream, so this
>> is just a matter of when would suit you best.
>>
> Hi Jeremy,
> 
> I'd be fine with leaving it as it is here in this patch set.  Not
> familiar with what fixups are in
> this context.

This would mean that I rework my initial series (ie, 1-13) to include
this change (but rolled into the changes, rather than a separate patch).
Since this updates my base series, you would re-consume that series, and
would drop this change from your set.

However, I'm happy to leave it as-is for now. We'd still need to do the
above before submitting upstream, but that can come later.

Cheers,


Jeremy
diff mbox

Patch

diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
index 10bf817..a3a860a 100644
--- a/drivers/fsi/fsi-core.c
+++ b/drivers/fsi/fsi-core.c
@@ -87,6 +87,7 @@  int fsi_device_peek(struct fsi_device *dev, void *val)
 static void fsi_device_release(struct device *_device)
 {
 	struct fsi_device *device = to_fsi_dev(_device);
+
 	kfree(device);
 }
 
@@ -185,8 +186,10 @@  static int fsi_slave_scan(struct fsi_slave *slave)
 		type = (conf & FSI_SLAVE_CONF_TYPE_MASK)
 			>> FSI_SLAVE_CONF_TYPE_SHIFT;
 
-		/* Unused address areas are marked by a zero type value; this
-		 * skips the defined address areas */
+		/*
+		 * Unused address areas are marked by a zero type value; this
+		 * skips the defined address areas
+		 */
 		if (type != 0) {
 
 			/* create device */
@@ -229,6 +232,7 @@  static int fsi_slave_scan(struct fsi_slave *slave)
 static void fsi_slave_release(struct device *dev)
 {
 	struct fsi_slave *slave = to_fsi_slave(dev);
+
 	kfree(slave);
 }
 
diff --git a/drivers/fsi/fsi-master-fake.c b/drivers/fsi/fsi-master-fake.c
index 50aac0b..ec1ed5e 100644
--- a/drivers/fsi/fsi-master-fake.c
+++ b/drivers/fsi/fsi-master-fake.c
@@ -93,4 +93,3 @@  static int __init fsi_master_fake_init(void)
 }
 
 module_init(fsi_master_fake_init);
-
diff --git a/drivers/fsi/fsi-master-gpio.c b/drivers/fsi/fsi-master-gpio.c
index 3855829..5c3d5cd 100644
--- a/drivers/fsi/fsi-master-gpio.c
+++ b/drivers/fsi/fsi-master-gpio.c
@@ -89,4 +89,3 @@  static struct platform_driver fsi_master_gpio_driver = {
 };
 
 module_platform_driver(fsi_master_gpio_driver);
-