Merge branch 'topic/soundcore-preclaim' into for-linus

* topic/soundcore-preclaim:
  sound: make OSS device number claiming optional and schedule its removal
  sound: request char-major-* module aliases for missing OSS devices
  chrdev: implement __[un]register_chrdev()

diff --combined include/linux/fs.h
index 73e9b643e45503dc6f01e31af2a8ec1f77de1264,6c36ab788854d2b8a3054ab1f9dd01846f5ef9eb..3972ffb597c58c1a41bf9483c231593bd43783e5
--- 1/include/linux/fs.h
--- 2/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -1998,12 -1998,25 +1998,25 @@@ extern void bd_release_from_disk(struc
  #define CHRDEV_MAJOR_HASH_SIZE        255
  extern int alloc_chrdev_region(dev_t *, unsigned, unsigned, const char *);
  extern int register_chrdev_region(dev_t, unsigned, const char *);
- extern int register_chrdev(unsigned int, const char *,
-                          const struct file_operations *);
- extern void unregister_chrdev(unsigned int, const char *);
+ extern int __register_chrdev(unsigned int major, unsigned int baseminor,
+                            unsigned int count, const char *name,
+                            const struct file_operations *fops);
+ extern void __unregister_chrdev(unsigned int major, unsigned int baseminor,
+                               unsigned int count, const char *name);
  extern void unregister_chrdev_region(dev_t, unsigned);
  extern void chrdev_show(struct seq_file *,off_t);
  
+ static inline int register_chrdev(unsigned int major, const char *name,
+                                 const struct file_operations *fops)
+ {
+       return __register_chrdev(major, 0, 256, name, fops);
+ }
+ 
+ static inline void unregister_chrdev(unsigned int major, const char *name)
+ {
+       __unregister_chrdev(major, 0, 256, name);
+ }
+ 
  /* fs/block_dev.c */
  #define BDEVNAME_SIZE 32      /* Largest string for a blockdev identifier */
  #define BDEVT_SIZE    10      /* Largest string for MAJ:MIN for blkdev */
@@@ -2123,7 -2136,7 +2136,7 @@@ extern struct file *do_filp_open(int df
                int open_flag, int mode, int acc_mode);
  extern int may_open(struct path *, int, int);
  
 -extern int kernel_read(struct file *, unsigned long, char *, unsigned long);
 +extern int kernel_read(struct file *, loff_t, char *, unsigned long);
  extern struct file * open_exec(const char *);
   
  /* fs/dcache.c -- generic fs support functions */
@@@ -2137,7 -2150,7 +2150,7 @@@ extern loff_t default_llseek(struct fil
  
  extern loff_t vfs_llseek(struct file *file, loff_t offset, int origin);
  
 -extern struct inode * inode_init_always(struct super_block *, struct inode *);
 +extern int inode_init_always(struct super_block *, struct inode *);
  extern void inode_init_once(struct inode *);
  extern void inode_add_to_lists(struct super_block *, struct inode *);
  extern void iput(struct inode *);
@@@ -2164,7 -2177,6 +2177,7 @@@ extern void __iget(struct inode * inode
  extern void iget_failed(struct inode *);
  extern void clear_inode(struct inode *);
  extern void destroy_inode(struct inode *);
 +extern void __destroy_inode(struct inode *);
  extern struct inode *new_inode(struct super_block *);
  extern int should_remove_suid(struct dentry *);
  extern int file_remove_suid(struct file *);