diff options
| author | Patrick Venture <venture@google.com> | 2019-04-25 16:23:47 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-25 16:37:52 -0400 |
| commit | 2d1c31cb642b44e3d621643b8d30e15e5e4df4e4 (patch) | |
| tree | ae212bef8eef56c15c4474386d962ec80a0321ba /drivers/misc | |
| parent | 06d5d6b7f9948a89543e1160ef852d57892c750d (diff) | |
drivers/misc: Add Aspeed P2A control driver
Fixup compiler warnings:
- 108 warning: ISO C90 forbids mixed declarations and code
- 264 warning: unused variable 'value'
- 335 warning: unused variable 'res'
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/aspeed-p2a-ctrl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/aspeed-p2a-ctrl.c b/drivers/misc/aspeed-p2a-ctrl.c index c0521b2ffc6a..9736821972ef 100644 --- a/drivers/misc/aspeed-p2a-ctrl.c +++ b/drivers/misc/aspeed-p2a-ctrl.c | |||
| @@ -99,13 +99,14 @@ static void aspeed_p2a_disable_bridge(struct aspeed_p2a_ctrl *p2a_ctrl) | |||
| 99 | 99 | ||
| 100 | static int aspeed_p2a_mmap(struct file *file, struct vm_area_struct *vma) | 100 | static int aspeed_p2a_mmap(struct file *file, struct vm_area_struct *vma) |
| 101 | { | 101 | { |
| 102 | unsigned long vsize; | ||
| 102 | struct aspeed_p2a_user *priv = file->private_data; | 103 | struct aspeed_p2a_user *priv = file->private_data; |
| 103 | struct aspeed_p2a_ctrl *ctrl = priv->parent; | 104 | struct aspeed_p2a_ctrl *ctrl = priv->parent; |
| 104 | 105 | ||
| 105 | if (ctrl->mem_base == 0 && ctrl->mem_size == 0) | 106 | if (ctrl->mem_base == 0 && ctrl->mem_size == 0) |
| 106 | return -EINVAL; | 107 | return -EINVAL; |
| 107 | 108 | ||
| 108 | unsigned long vsize = vma->vm_end - vma->vm_start; | 109 | vsize = vma->vm_end - vma->vm_start; |
| 109 | pgprot_t prot = vma->vm_page_prot; | 110 | pgprot_t prot = vma->vm_page_prot; |
| 110 | 111 | ||
| 111 | if (vma->vm_pgoff + vsize > ctrl->mem_base + ctrl->mem_size) | 112 | if (vma->vm_pgoff + vsize > ctrl->mem_base + ctrl->mem_size) |
| @@ -261,7 +262,6 @@ static int aspeed_p2a_open(struct inode *inode, struct file *file) | |||
| 261 | static int aspeed_p2a_release(struct inode *inode, struct file *file) | 262 | static int aspeed_p2a_release(struct inode *inode, struct file *file) |
| 262 | { | 263 | { |
| 263 | int i; | 264 | int i; |
| 264 | u32 value; | ||
| 265 | u32 bits = 0; | 265 | u32 bits = 0; |
| 266 | bool open_regions = false; | 266 | bool open_regions = false; |
| 267 | struct aspeed_p2a_user *priv = file->private_data; | 267 | struct aspeed_p2a_user *priv = file->private_data; |
| @@ -332,7 +332,7 @@ static int aspeed_p2a_ctrl_probe(struct platform_device *pdev) | |||
| 332 | { | 332 | { |
| 333 | struct aspeed_p2a_ctrl *misc_ctrl; | 333 | struct aspeed_p2a_ctrl *misc_ctrl; |
| 334 | struct device *dev; | 334 | struct device *dev; |
| 335 | struct resource *res, resm; | 335 | struct resource resm; |
| 336 | struct device_node *node; | 336 | struct device_node *node; |
| 337 | int rc = 0; | 337 | int rc = 0; |
| 338 | 338 | ||
