* [PATCH -next] hwmon (pmbus/max20730): Whitespace cleanups in max20730.c
@ 2020-07-24 10:11 Wang ShaoBo
2020-07-24 14:39 ` Guenter Roeck
0 siblings, 1 reply; 3+ messages in thread
From: Wang ShaoBo @ 2020-07-24 10:11 UTC (permalink / raw)
Cc: cj.chengjian, huawei.libin, jdelvare, linux-kernel, linux-hwmon
Drop trailing whitespace.
Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>
---
drivers/hwmon/pmbus/max20730.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/hwmon/pmbus/max20730.c b/drivers/hwmon/pmbus/max20730.c
index 3ddc19b81b90..87d936d45d65 100644
--- a/drivers/hwmon/pmbus/max20730.c
+++ b/drivers/hwmon/pmbus/max20730.c
@@ -309,7 +309,7 @@ static int max20730_probe(struct i2c_client *client,
I2C_FUNC_SMBUS_READ_WORD_DATA |
I2C_FUNC_SMBUS_BLOCK_DATA))
return -ENODEV;
-
+
ret = i2c_smbus_read_block_data(client, PMBUS_MFR_ID, buf);
if (ret < 0) {
dev_err(&client->dev, "Failed to read Manufacturer ID\n");
@@ -373,7 +373,7 @@ static int max20730_probe(struct i2c_client *client,
ret = pmbus_do_probe(client, id, &data->info);
if (ret < 0)
return ret;
-
+
return 0;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH -next] hwmon (pmbus/max20730): Whitespace cleanups in max20730.c
2020-07-24 10:11 [PATCH -next] hwmon (pmbus/max20730): Whitespace cleanups in max20730.c Wang ShaoBo
@ 2020-07-24 14:39 ` Guenter Roeck
2020-07-24 14:42 ` Guenter Roeck
0 siblings, 1 reply; 3+ messages in thread
From: Guenter Roeck @ 2020-07-24 14:39 UTC (permalink / raw)
To: Wang ShaoBo
Cc: cj.chengjian, huawei.libin, jdelvare, linux-kernel, linux-hwmon
On 7/24/20 3:11 AM, Wang ShaoBo wrote:
> Drop trailing whitespace.
>
> Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>
> ---
> drivers/hwmon/pmbus/max20730.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hwmon/pmbus/max20730.c b/drivers/hwmon/pmbus/max20730.c
> index 3ddc19b81b90..87d936d45d65 100644
> --- a/drivers/hwmon/pmbus/max20730.c
> +++ b/drivers/hwmon/pmbus/max20730.c
> @@ -309,7 +309,7 @@ static int max20730_probe(struct i2c_client *client,
> I2C_FUNC_SMBUS_READ_WORD_DATA |
> I2C_FUNC_SMBUS_BLOCK_DATA))
> return -ENODEV;
> -
> +
> ret = i2c_smbus_read_block_data(client, PMBUS_MFR_ID, buf);
> if (ret < 0) {
> dev_err(&client->dev, "Failed to read Manufacturer ID\n");
> @@ -373,7 +373,7 @@ static int max20730_probe(struct i2c_client *client,
> ret = pmbus_do_probe(client, id, &data->info);
> if (ret < 0)
> return ret;
> -
> +
> return 0;
The code you are fixing is not in the mainline kernel, and your patch
does not apply.
Guenter
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH -next] hwmon (pmbus/max20730): Whitespace cleanups in max20730.c
2020-07-24 14:39 ` Guenter Roeck
@ 2020-07-24 14:42 ` Guenter Roeck
0 siblings, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2020-07-24 14:42 UTC (permalink / raw)
To: Wang ShaoBo
Cc: cj.chengjian, huawei.libin, jdelvare, linux-kernel, linux-hwmon
On 7/24/20 7:39 AM, Guenter Roeck wrote:
> On 7/24/20 3:11 AM, Wang ShaoBo wrote:
>> Drop trailing whitespace.
>>
>> Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>
>> ---
>> drivers/hwmon/pmbus/max20730.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/hwmon/pmbus/max20730.c b/drivers/hwmon/pmbus/max20730.c
>> index 3ddc19b81b90..87d936d45d65 100644
>> --- a/drivers/hwmon/pmbus/max20730.c
>> +++ b/drivers/hwmon/pmbus/max20730.c
>> @@ -309,7 +309,7 @@ static int max20730_probe(struct i2c_client *client,
>> I2C_FUNC_SMBUS_READ_WORD_DATA |
>> I2C_FUNC_SMBUS_BLOCK_DATA))
>> return -ENODEV;
>> -
>> +
>> ret = i2c_smbus_read_block_data(client, PMBUS_MFR_ID, buf);
>> if (ret < 0) {
>> dev_err(&client->dev, "Failed to read Manufacturer ID\n");
>> @@ -373,7 +373,7 @@ static int max20730_probe(struct i2c_client *client,
>> ret = pmbus_do_probe(client, id, &data->info);
>> if (ret < 0)
>> return ret;
>> -
>> +
>> return 0;
>
> The code you are fixing is not in the mainline kernel, and your patch
> does not apply.
>
Wait, this code is in -next. I really didn't pay attention, sorry. I'll update
the offending patch there. Thanks for bringing this to my attention.
Guenter
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-24 14:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-24 10:11 [PATCH -next] hwmon (pmbus/max20730): Whitespace cleanups in max20730.c Wang ShaoBo
2020-07-24 14:39 ` Guenter Roeck
2020-07-24 14:42 ` Guenter Roeck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.