Clang prints a warning:
drivers/gpu/drm/drm_lock.c:363:6: warning: misleading indentation;
statement is not part of the previous 'if' [-Wmisleading-indentation]
*/ mutex_lock(&dev->struct_mutex);
^
drivers/gpu/drm/drm_lock.c:357:2: note: previous statement is here
if (!drm_core_check_feature(dev, DRIVER_LEGACY))
^
Fix this by adding a newline after the multi-line comment.
Fixes: 058ca50ce3f1 ("drm/legacy: move lock cleanup for master into lock file (v2)")
Link: https://github.com/ClangBuiltLinux/linux/issues/855
Signed-off-by: Stefan Agner <[email protected]>
---
drivers/gpu/drm/drm_lock.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index 2e8ce99d0baa..2c79e8199e3c 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -360,7 +360,8 @@ void drm_legacy_lock_master_cleanup(struct drm_device *dev, struct drm_master *m
/*
* Since the master is disappearing, so is the
* possibility to lock.
- */ mutex_lock(&dev->struct_mutex);
+ */
+ mutex_lock(&dev->struct_mutex);
if (master->lock.hw_lock) {
if (dev->sigdata.lock == master->lock.hw_lock)
dev->sigdata.lock = NULL;
--
2.25.0
On Wed, 2020-02-05 at 23:26 +0100, Stefan Agner wrote:
> Clang prints a warning:
> drivers/gpu/drm/drm_lock.c:363:6: warning: misleading indentation;
> statement is not part of the previous 'if' [-Wmisleading-indentation]
> */ mutex_lock(&dev->struct_mutex);
> ^
> drivers/gpu/drm/drm_lock.c:357:2: note: previous statement is here
> if (!drm_core_check_feature(dev, DRIVER_LEGACY))
> ^
>
> Fix this by adding a newline after the multi-line comment.
Thanks, already in -next
commit 5b99cad6966b92f757863ff9b6688051633fde9a
Author: Dan Carpenter <[email protected]>
Date: Wed Jan 8 08:43:12 2020 +0300
gpu/drm: clean up white space in drm_legacy_lock_master_cleanup()
We moved this code to a different file and accidentally deleted a
newline.
Signed-off-by: Dan Carpenter <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
On 2020-02-05 23:50, Joe Perches wrote:
> On Wed, 2020-02-05 at 23:26 +0100, Stefan Agner wrote:
>> Clang prints a warning:
>> drivers/gpu/drm/drm_lock.c:363:6: warning: misleading indentation;
>> statement is not part of the previous 'if' [-Wmisleading-indentation]
>> */ mutex_lock(&dev->struct_mutex);
>> ^
>> drivers/gpu/drm/drm_lock.c:357:2: note: previous statement is here
>> if (!drm_core_check_feature(dev, DRIVER_LEGACY))
>> ^
>>
>> Fix this by adding a newline after the multi-line comment.
>
> Thanks, already in -next
Whoops, sorry for the duplication. Searched for "indentation" which did
not bring that one up.
--
Stefan
>
> commit 5b99cad6966b92f757863ff9b6688051633fde9a
> Author: Dan Carpenter <[email protected]>
> Date: Wed Jan 8 08:43:12 2020 +0300
>
> gpu/drm: clean up white space in drm_legacy_lock_master_cleanup()
>
> We moved this code to a different file and accidentally deleted a
> newline.
>
> Signed-off-by: Dan Carpenter <[email protected]>
> Signed-off-by: Daniel Vetter <[email protected]>
> Link:
> https://patchwork.freedesktop.org/patch/msgid/[email protected]