Skip to content

Commit

Permalink
uml: formatting fixes around os_{read_write}_file callers
Browse files Browse the repository at this point in the history
Formatting fixes ahead of renaming os_{read_write}_file_k to
os_{read_write}_file and fixing all the callers.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed May 7, 2007
1 parent fda83a9 commit dc764e5
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 120 deletions.
11 changes: 0 additions & 11 deletions arch/um/drivers/chan_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,3 @@ void register_winch(int fd, struct tty_struct *tty)
}
}
}

/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
17 changes: 5 additions & 12 deletions arch/um/drivers/cow_sys.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

static inline void *cow_malloc(int size)
{
return(um_kmalloc(size));
return um_kmalloc(size);
}

static inline void cow_free(void *ptr)
Expand All @@ -20,29 +20,22 @@ static inline void cow_free(void *ptr)

static inline char *cow_strdup(char *str)
{
return(uml_strdup(str));
return uml_strdup(str);
}

static inline int cow_seek_file(int fd, __u64 offset)
{
return(os_seek_file(fd, offset));
return os_seek_file(fd, offset);
}

static inline int cow_file_size(char *file, unsigned long long *size_out)
{
return(os_file_size(file, size_out));
return os_file_size(file, size_out);
}

static inline int cow_write_file(int fd, void *buf, int size)
{
return(os_write_file_k(fd, buf, size));
return os_write_file_k(fd, buf, size);
}

#endif

/*
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
Loading

0 comments on commit dc764e5

Please sign in to comment.