aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/carma/carma-fpga-program.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-11-23 09:23:48 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-26 22:30:05 -0500
commite976a725e075be8efe6950735603c88dd6e01be0 (patch)
treebc1f5baf86c69179d5e88700113ea6ec47aa1ecd /drivers/misc/carma/carma-fpga-program.c
parent723493ca59c8d81fed3e7f261165fee493a29ffa (diff)
carma-fpga-program.c: fix compile errors
drivers/misc/carma/carma-fpga-program.c: In function 'fpga_program_dma': drivers/misc/carma/carma-fpga-program.c:529:2: error: expected ';' before 'if' if (ret) { ^ drivers/misc/carma/carma-fpga-program.c: In function 'fpga_read': drivers/misc/carma/carma-fpga-program.c:752:45: error: 'ppos' undeclared (first use in this function) return simple_read_from_buffer(buf, count, ppos, ^ drivers/misc/carma/carma-fpga-program.c:752:45: note: each undeclared identifier is reported only once for each function it appears in drivers/misc/carma/carma-fpga-program.c: In function 'fpga_llseek': drivers/misc/carma/carma-fpga-program.c:765:27: error: 'file' undeclared (first use in this function) return fixed_size_llseek(file, offset, origin, priv->fw_size); ^ drivers/misc/carma/carma-fpga-program.c:759:9: warning: unused variable 'newpos' [-Wunused-variable] loff_t newpos; ^ drivers/misc/carma/carma-fpga-program.c: In function 'fpga_read': drivers/misc/carma/carma-fpga-program.c:754:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ drivers/misc/carma/carma-fpga-program.c: In function 'fpga_llseek': drivers/misc/carma/carma-fpga-program.c:766:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ scripts/Makefile.build:263: recipe for target 'drivers/misc/carma/carma-fpga-program.o' failed Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/carma/carma-fpga-program.c')
-rw-r--r--drivers/misc/carma/carma-fpga-program.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/misc/carma/carma-fpga-program.c b/drivers/misc/carma/carma-fpga-program.c
index 339b252fcedd..eb8942baafc8 100644
--- a/drivers/misc/carma/carma-fpga-program.c
+++ b/drivers/misc/carma/carma-fpga-program.c
@@ -525,7 +525,7 @@ static noinline int fpga_program_dma(struct fpga_dev *priv)
525 goto out_dma_unmap; 525 goto out_dma_unmap;
526 } 526 }
527 527
528 ret = fsl_dma_external_start(chan, 1) 528 ret = fsl_dma_external_start(chan, 1);
529 if (ret) { 529 if (ret) {
530 dev_err(priv->dev, "DMA external control setup failed\n"); 530 dev_err(priv->dev, "DMA external control setup failed\n");
531 goto out_dma_unmap; 531 goto out_dma_unmap;
@@ -749,20 +749,19 @@ static ssize_t fpga_read(struct file *filp, char __user *buf, size_t count,
749 loff_t *f_pos) 749 loff_t *f_pos)
750{ 750{
751 struct fpga_dev *priv = filp->private_data; 751 struct fpga_dev *priv = filp->private_data;
752 return simple_read_from_buffer(buf, count, ppos, 752 return simple_read_from_buffer(buf, count, f_pos,
753 priv->vb.vaddr, priv->bytes); 753 priv->vb.vaddr, priv->bytes);
754} 754}
755 755
756static loff_t fpga_llseek(struct file *filp, loff_t offset, int origin) 756static loff_t fpga_llseek(struct file *filp, loff_t offset, int origin)
757{ 757{
758 struct fpga_dev *priv = filp->private_data; 758 struct fpga_dev *priv = filp->private_data;
759 loff_t newpos;
760 759
761 /* only read-only opens are allowed to seek */ 760 /* only read-only opens are allowed to seek */
762 if ((filp->f_flags & O_ACCMODE) != O_RDONLY) 761 if ((filp->f_flags & O_ACCMODE) != O_RDONLY)
763 return -EINVAL; 762 return -EINVAL;
764 763
765 return fixed_size_llseek(file, offset, origin, priv->fw_size); 764 return fixed_size_llseek(filp, offset, origin, priv->fw_size);
766} 765}
767 766
768static const struct file_operations fpga_fops = { 767static const struct file_operations fpga_fops = {