Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 61562
b: refs/heads/master
c: 39ef01e
h: refs/heads/master
v: v3
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Jul 19, 2007
1 parent 471d419 commit 64cbaae
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4004c69ad68dd03733179277280ea2946990ba36
refs/heads/master: 39ef01e00daf6d860783f1a836f765265a9d3b47
20 changes: 10 additions & 10 deletions trunk/drivers/char/mbcs.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@
#else
#define DBG(fmt...)
#endif
int mbcs_major;
static int mbcs_major;

LIST_HEAD(soft_list);
static LIST_HEAD(soft_list);

/*
* file operations
*/
const struct file_operations mbcs_ops = {
static const struct file_operations mbcs_ops = {
.open = mbcs_open,
.llseek = mbcs_sram_llseek,
.read = mbcs_sram_read,
Expand Down Expand Up @@ -377,7 +377,7 @@ do_mbcs_sram_dmaread(struct mbcs_soft *soft, uint64_t hostAddr,
return rv;
}

int mbcs_open(struct inode *ip, struct file *fp)
static int mbcs_open(struct inode *ip, struct file *fp)
{
struct mbcs_soft *soft;
int minor;
Expand All @@ -394,7 +394,7 @@ int mbcs_open(struct inode *ip, struct file *fp)
return -ENODEV;
}

ssize_t mbcs_sram_read(struct file * fp, char __user *buf, size_t len, loff_t * off)
static ssize_t mbcs_sram_read(struct file * fp, char __user *buf, size_t len, loff_t * off)
{
struct cx_dev *cx_dev = fp->private_data;
struct mbcs_soft *soft = cx_dev->soft;
Expand All @@ -418,7 +418,7 @@ ssize_t mbcs_sram_read(struct file * fp, char __user *buf, size_t len, loff_t *
return rv;
}

ssize_t
static ssize_t
mbcs_sram_write(struct file * fp, const char __user *buf, size_t len, loff_t * off)
{
struct cx_dev *cx_dev = fp->private_data;
Expand All @@ -443,7 +443,7 @@ mbcs_sram_write(struct file * fp, const char __user *buf, size_t len, loff_t * o
return rv;
}

loff_t mbcs_sram_llseek(struct file * filp, loff_t off, int whence)
static loff_t mbcs_sram_llseek(struct file * filp, loff_t off, int whence)
{
loff_t newpos;

Expand Down Expand Up @@ -491,7 +491,7 @@ static void mbcs_gscr_pioaddr_set(struct mbcs_soft *soft)
soft->gscr_addr = mbcs_pioaddr(soft, MBCS_GSCR_START);
}

int mbcs_gscr_mmap(struct file *fp, struct vm_area_struct *vma)
static int mbcs_gscr_mmap(struct file *fp, struct vm_area_struct *vma)
{
struct cx_dev *cx_dev = fp->private_data;
struct mbcs_soft *soft = cx_dev->soft;
Expand Down Expand Up @@ -793,7 +793,7 @@ static int mbcs_remove(struct cx_dev *dev)
return 0;
}

const struct cx_device_id __devinitdata mbcs_id_table[] = {
static const struct cx_device_id __devinitdata mbcs_id_table[] = {
{
.part_num = MBCS_PART_NUM,
.mfg_num = MBCS_MFG_NUM,
Expand All @@ -807,7 +807,7 @@ const struct cx_device_id __devinitdata mbcs_id_table[] = {

MODULE_DEVICE_TABLE(cx, mbcs_id_table);

struct cx_drv mbcs_driver = {
static struct cx_drv mbcs_driver = {
.name = DEVICE_NAME,
.id_table = mbcs_id_table,
.probe = mbcs_probe,
Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/char/mbcs.h
Original file line number Diff line number Diff line change
Expand Up @@ -542,12 +542,12 @@ struct mbcs_soft {
struct semaphore algolock;
};

extern int mbcs_open(struct inode *ip, struct file *fp);
extern ssize_t mbcs_sram_read(struct file *fp, char __user *buf, size_t len,
static int mbcs_open(struct inode *ip, struct file *fp);
static ssize_t mbcs_sram_read(struct file *fp, char __user *buf, size_t len,
loff_t * off);
extern ssize_t mbcs_sram_write(struct file *fp, const char __user *buf, size_t len,
static ssize_t mbcs_sram_write(struct file *fp, const char __user *buf, size_t len,
loff_t * off);
extern loff_t mbcs_sram_llseek(struct file *filp, loff_t off, int whence);
extern int mbcs_gscr_mmap(struct file *fp, struct vm_area_struct *vma);
static loff_t mbcs_sram_llseek(struct file *filp, loff_t off, int whence);
static int mbcs_gscr_mmap(struct file *fp, struct vm_area_struct *vma);

#endif // __MBCS_H__

0 comments on commit 64cbaae

Please sign in to comment.