Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / drivers / net / wireless / bcm43xx / bcm43xx_debugfs.c

diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
index 923275ea0789aa6e26b031a74b521b64f2ce7eb2..35dbe455451306886ee42670648184046416c7f4 100644 (file)
--- a/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_debugfs.c
@@ -54,7 +54,7 @@ static ssize_t write_file_dummy(struct file *file, const char __user *buf,
 
 static int open_file_generic(struct inode *inode, struct file *file)
 {
-       file->private_data = inode->u.generic_ip;
+       file->private_data = inode->i_private;
        return 0;
 }
 
@@ -355,37 +355,37 @@ out_up:
 #undef fappend
 
 
-static struct file_operations devinfo_fops = {
+static const struct file_operations devinfo_fops = {
        .read = devinfo_read_file,
        .write = write_file_dummy,
        .open = open_file_generic,
 };
 
-static struct file_operations spromdump_fops = {
+static const struct file_operations spromdump_fops = {
        .read = spromdump_read_file,
        .write = write_file_dummy,
        .open = open_file_generic,
 };
 
-static struct file_operations drvinfo_fops = {
+static const struct file_operations drvinfo_fops = {
        .read = drvinfo_read_file,
        .write = write_file_dummy,
        .open = open_file_generic,
 };
 
-static struct file_operations tsf_fops = {
+static const struct file_operations tsf_fops = {
        .read = tsf_read_file,
        .write = tsf_write_file,
        .open = open_file_generic,
 };
 
-static struct file_operations txstat_fops = {
+static const struct file_operations txstat_fops = {
        .read = txstat_read_file,
        .write = write_file_dummy,
        .open = open_file_generic,
 };
 
-static struct file_operations restart_fops = {
+static const struct file_operations restart_fops = {
        .write = restart_write_file,
        .open = open_file_generic,
 };