projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into for_paulus
[linux-drm-fsl-dcu.git]
/
drivers
/
char
/
mbcs.c
diff --git
a/drivers/char/mbcs.c
b/drivers/char/mbcs.c
index 0385650f6077892843b966f3c68018c254a46492..57f9115a456cfd4b2443195a7fd67d545dd21318 100644
(file)
--- a/
drivers/char/mbcs.c
+++ b/
drivers/char/mbcs.c
@@
-22,6
+22,7
@@
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/mm.h>
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/mm.h>
+#include <linux/fs.h>
#include <linux/uio.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <linux/uio.h>
#include <asm/io.h>
#include <asm/uaccess.h>
@@
-45,7
+46,7
@@
LIST_HEAD(soft_list);
/*
* file operations
*/
/*
* file operations
*/
-struct file_operations mbcs_ops = {
+
const
struct file_operations mbcs_ops = {
.open = mbcs_open,
.llseek = mbcs_sram_llseek,
.read = mbcs_sram_read,
.open = mbcs_open,
.llseek = mbcs_sram_llseek,
.read = mbcs_sram_read,
@@
-447,15
+448,15
@@
loff_t mbcs_sram_llseek(struct file * filp, loff_t off, int whence)
loff_t newpos;
switch (whence) {
loff_t newpos;
switch (whence) {
- case
0: /* SEEK_SET */
+ case
SEEK_SET:
newpos = off;
break;
newpos = off;
break;
- case
1: /* SEEK_CUR */
+ case
SEEK_CUR:
newpos = filp->f_pos + off;
break;
newpos = filp->f_pos + off;
break;
- case
2: /* SEEK_END */
+ case
SEEK_END:
newpos = MBCS_SRAM_SIZE + off;
break;
newpos = MBCS_SRAM_SIZE + off;
break;
@@
-515,11
+516,10
@@
int mbcs_gscr_mmap(struct file *fp, struct vm_area_struct *vma)
* mbcs_completion_intr_handler - Primary completion handler.
* @irq: irq
* @arg: soft struct for device
* mbcs_completion_intr_handler - Primary completion handler.
* @irq: irq
* @arg: soft struct for device
- * @ep: regs
*
*/
static irqreturn_t
*
*/
static irqreturn_t
-mbcs_completion_intr_handler(int irq, void *arg
, struct pt_regs *ep
)
+mbcs_completion_intr_handler(int irq, void *arg)
{
struct mbcs_soft *soft = (struct mbcs_soft *)arg;
void *mmr_base;
{
struct mbcs_soft *soft = (struct mbcs_soft *)arg;
void *mmr_base;