* [PATCH] misc: aspeed-p2a-ctrl: fix mixed declarations
@ 2019-04-26 16:56 Patrick Venture
2019-04-29 6:34 ` Joel Stanley
2019-05-02 3:38 ` Andrew Jeffery
0 siblings, 2 replies; 3+ messages in thread
From: Patrick Venture @ 2019-04-26 16:56 UTC (permalink / raw)
To: venture, arnd, gregkh, joel, andrew
Cc: linux-arm-kernel, linux-aspeed, linux-kernel, arm, Stephen Rothwell
Fix up mixed declarations and code in aspeed_p2a_mmap.
Tested: Verified the build had the error and that this patch resolved it
and there were no other warnings or build errors associated with
compilation of this driver.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Patrick Venture <venture@google.com>
---
drivers/misc/aspeed-p2a-ctrl.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/aspeed-p2a-ctrl.c b/drivers/misc/aspeed-p2a-ctrl.c
index 9736821972ef..b60fbeaffcbd 100644
--- a/drivers/misc/aspeed-p2a-ctrl.c
+++ b/drivers/misc/aspeed-p2a-ctrl.c
@@ -100,6 +100,7 @@ static void aspeed_p2a_disable_bridge(struct aspeed_p2a_ctrl *p2a_ctrl)
static int aspeed_p2a_mmap(struct file *file, struct vm_area_struct *vma)
{
unsigned long vsize;
+ pgprot_t prot;
struct aspeed_p2a_user *priv = file->private_data;
struct aspeed_p2a_ctrl *ctrl = priv->parent;
@@ -107,7 +108,7 @@ static int aspeed_p2a_mmap(struct file *file, struct vm_area_struct *vma)
return -EINVAL;
vsize = vma->vm_end - vma->vm_start;
- pgprot_t prot = vma->vm_page_prot;
+ prot = vma->vm_page_prot;
if (vma->vm_pgoff + vsize > ctrl->mem_base + ctrl->mem_size)
return -EINVAL;
--
2.21.0.593.g511ec345e18-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] misc: aspeed-p2a-ctrl: fix mixed declarations
2019-04-26 16:56 [PATCH] misc: aspeed-p2a-ctrl: fix mixed declarations Patrick Venture
@ 2019-04-29 6:34 ` Joel Stanley
2019-05-02 3:38 ` Andrew Jeffery
1 sibling, 0 replies; 3+ messages in thread
From: Joel Stanley @ 2019-04-29 6:34 UTC (permalink / raw)
To: Patrick Venture
Cc: Arnd Bergmann, Greg KH, Andrew Jeffery, Linux ARM, linux-aspeed,
Linux Kernel Mailing List, arm, Stephen Rothwell
On Fri, 26 Apr 2019 at 16:57, Patrick Venture <venture@google.com> wrote:
>
> Fix up mixed declarations and code in aspeed_p2a_mmap.
>
> Tested: Verified the build had the error and that this patch resolved it
> and there were no other warnings or build errors associated with
> compilation of this driver.
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Patrick Venture <venture@google.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
> ---
> drivers/misc/aspeed-p2a-ctrl.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/misc/aspeed-p2a-ctrl.c b/drivers/misc/aspeed-p2a-ctrl.c
> index 9736821972ef..b60fbeaffcbd 100644
> --- a/drivers/misc/aspeed-p2a-ctrl.c
> +++ b/drivers/misc/aspeed-p2a-ctrl.c
> @@ -100,6 +100,7 @@ static void aspeed_p2a_disable_bridge(struct aspeed_p2a_ctrl *p2a_ctrl)
> static int aspeed_p2a_mmap(struct file *file, struct vm_area_struct *vma)
> {
> unsigned long vsize;
> + pgprot_t prot;
> struct aspeed_p2a_user *priv = file->private_data;
> struct aspeed_p2a_ctrl *ctrl = priv->parent;
>
> @@ -107,7 +108,7 @@ static int aspeed_p2a_mmap(struct file *file, struct vm_area_struct *vma)
> return -EINVAL;
>
> vsize = vma->vm_end - vma->vm_start;
> - pgprot_t prot = vma->vm_page_prot;
> + prot = vma->vm_page_prot;
>
> if (vma->vm_pgoff + vsize > ctrl->mem_base + ctrl->mem_size)
> return -EINVAL;
> --
> 2.21.0.593.g511ec345e18-goog
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] misc: aspeed-p2a-ctrl: fix mixed declarations
2019-04-26 16:56 [PATCH] misc: aspeed-p2a-ctrl: fix mixed declarations Patrick Venture
2019-04-29 6:34 ` Joel Stanley
@ 2019-05-02 3:38 ` Andrew Jeffery
1 sibling, 0 replies; 3+ messages in thread
From: Andrew Jeffery @ 2019-05-02 3:38 UTC (permalink / raw)
To: Patrick Venture, Arnd Bergmann, Greg Kroah-Hartman, Joel Stanley
Cc: linux-arm-kernel, linux-aspeed, linux-kernel, arm, Stephen Rothwell
On Sat, 27 Apr 2019, at 02:27, Patrick Venture wrote:
> Fix up mixed declarations and code in aspeed_p2a_mmap.
>
> Tested: Verified the build had the error and that this patch resolved it
> and there were no other warnings or build errors associated with
> compilation of this driver.
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Patrick Venture <venture@google.com>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
> ---
> drivers/misc/aspeed-p2a-ctrl.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/misc/aspeed-p2a-ctrl.c
> b/drivers/misc/aspeed-p2a-ctrl.c
> index 9736821972ef..b60fbeaffcbd 100644
> --- a/drivers/misc/aspeed-p2a-ctrl.c
> +++ b/drivers/misc/aspeed-p2a-ctrl.c
> @@ -100,6 +100,7 @@ static void aspeed_p2a_disable_bridge(struct
> aspeed_p2a_ctrl *p2a_ctrl)
> static int aspeed_p2a_mmap(struct file *file, struct vm_area_struct
> *vma)
> {
> unsigned long vsize;
> + pgprot_t prot;
> struct aspeed_p2a_user *priv = file->private_data;
> struct aspeed_p2a_ctrl *ctrl = priv->parent;
>
> @@ -107,7 +108,7 @@ static int aspeed_p2a_mmap(struct file *file,
> struct vm_area_struct *vma)
> return -EINVAL;
>
> vsize = vma->vm_end - vma->vm_start;
> - pgprot_t prot = vma->vm_page_prot;
> + prot = vma->vm_page_prot;
>
> if (vma->vm_pgoff + vsize > ctrl->mem_base + ctrl->mem_size)
> return -EINVAL;
> --
> 2.21.0.593.g511ec345e18-goog
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-02 3:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-26 16:56 [PATCH] misc: aspeed-p2a-ctrl: fix mixed declarations Patrick Venture
2019-04-29 6:34 ` Joel Stanley
2019-05-02 3:38 ` Andrew Jeffery
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).