carma-fpga-program.c: fix compile errors

Hans Verkuil · gregkh · commit e976a725e075 · 2014-11-26T19:30:05.000-08:00
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-&gt;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 &lt;hans.verkuil@cisco.com&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git 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)
 		goto out_dma_unmap;
 	}
 
-	ret = fsl_dma_external_start(chan, 1)
+	ret = fsl_dma_external_start(chan, 1);
 	if (ret) {
 		dev_err(priv->dev, "DMA external control setup failed\n");
 		goto out_dma_unmap;
@@ -749,20 +749,19 @@ static ssize_t fpga_read(struct file *filp, char __user *buf, size_t count,
 			 loff_t *f_pos)
 {
 	struct fpga_dev *priv = filp->private_data;
-	return simple_read_from_buffer(buf, count, ppos,
+	return simple_read_from_buffer(buf, count, f_pos,
 				       priv->vb.vaddr, priv->bytes);
 }
 
 static loff_t fpga_llseek(struct file *filp, loff_t offset, int origin)
 {
 	struct fpga_dev *priv = filp->private_data;
-	loff_t newpos;
 
 	/* only read-only opens are allowed to seek */
 	if ((filp->f_flags & O_ACCMODE) != O_RDONLY)
 		return -EINVAL;
 
-	return fixed_size_llseek(file, offset, origin, priv->fw_size);
+	return fixed_size_llseek(filp, offset, origin, priv->fw_size);
 }
 
 static const struct file_operations fpga_fops = {

Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,7 @@ static noinline int fpga_program_dma(struct fpga_dev *priv)`
`525`	`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`	`529`	`if (ret) {`
`530`	`530`	`dev_err(priv->dev, "DMA external control setup failed\n");`
`531`	`531`	`goto out_dma_unmap;`
`@@ -749,20 +749,19 @@ static ssize_t fpga_read(struct file filp, char __user buf, size_t count,`
`749`	`749`	`loff_t *f_pos)`
`750`	`750`	`{`
`751`	`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`	`753`	`priv->vb.vaddr, priv->bytes);`
`754`	`754`	`}`
`755`	`755`
`756`	`756`	`static loff_t fpga_llseek(struct file *filp, loff_t offset, int origin)`
`757`	`757`	`{`
`758`	`758`	`struct fpga_dev *priv = filp->private_data;`
`759`		`- loff_t newpos;`
`760`	`759`
`761`	`760`	`/* only read-only opens are allowed to seek */`
`762`	`761`	`if ((filp->f_flags & O_ACCMODE) != O_RDONLY)`
`763`	`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`
`768`	`767`	`static const struct file_operations fpga_fops = {`