2021-02-19 12:00:33

by Amrit Khera

[permalink] [raw]
Subject: [PATCH v2] staging: android: Fix const keyword style issue in ashmem.c

This change fixes a checkpatch warning for "struct file_operations
should normally be const".

Signed-off-by: Amrit Khera <[email protected]>
---
Changes in v2:
- Wrapped the commit description
- Build tested
---
drivers/staging/android/ashmem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
index d66a64e42273..7854fd410efa 100644
--- a/drivers/staging/android/ashmem.c
+++ b/drivers/staging/android/ashmem.c
@@ -376,7 +376,7 @@ ashmem_vmfile_get_unmapped_area(struct file *file, unsigned long addr,

static int ashmem_mmap(struct file *file, struct vm_area_struct *vma)
{
- static struct file_operations vmfile_fops;
+ static const struct file_operations vmfile_fops;
struct ashmem_area *asma = file->private_data;
int ret = 0;

--
2.20.1


2021-02-19 12:08:25

by Dan Carpenter

[permalink] [raw]
Subject: Re: [PATCH v2] staging: android: Fix const keyword style issue in ashmem.c

On Fri, Feb 19, 2021 at 05:12:38PM +0530, Amrit Khera wrote:
> This change fixes a checkpatch warning for "struct file_operations
> should normally be const".
>
> Signed-off-by: Amrit Khera <[email protected]>
> ---
> Changes in v2:
> - Wrapped the commit description
> - Build tested
^^^^^^^^^^^^
Heh. Nope.

This breaks the build.

regards,
dan carpenter

2021-02-19 12:15:21

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH v2] staging: android: Fix const keyword style issue in ashmem.c

On Fri, Feb 19, 2021 at 05:12:38PM +0530, Amrit Khera wrote:
> This change fixes a checkpatch warning for "struct file_operations
> should normally be const".
>
> Signed-off-by: Amrit Khera <[email protected]>
> ---
> Changes in v2:
> - Wrapped the commit description
> - Build tested

If you tested it, what changed in the diff itself? Looks the same to
me...

2021-02-19 13:44:52

by Amrit Khera

[permalink] [raw]
Subject: Re: [PATCH v2] staging: android: Fix const keyword style issue in ashmem.c

On Fri, Feb 19, 2021 at 01:12:49PM +0100, Greg KH wrote:
> On Fri, Feb 19, 2021 at 05:12:38PM +0530, Amrit Khera wrote:
> > This change fixes a checkpatch warning for "struct file_operations
> > should normally be const".
> >
> > Signed-off-by: Amrit Khera <[email protected]>
> > ---
> > Changes in v2:
> > - Wrapped the commit description
> > - Build tested
>
> If you tested it, what changed in the diff itself? Looks the same to
> me...
>

After further investigating I found that the particular kernel module
was not set in the config file. This did not build it when I built the
kernel. This was making me think that the module was building correctly.

After updating the config, the build indeed breaks. The reason is that
the const keyword cannot be applied here without changing the structure
and flow of the code as the particular variable is later being set in a
condition. Hence, I will be dropping this path for now.

Apologies for the inconvenience caused and thank you for the prompt
replies.

Best Regards,
Amrit Khera