5 files changed, 13 insertions, 37 deletions

diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index 601df809a26a..1765a197acb0 100644
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -40,12 +40,6 @@ static void __iomem *audmux_base;
 #ifdef CONFIG_DEBUG_FS
 static struct dentry *audmux_debugfs_root;
 
-static int audmux_open_file(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 /* There is an annoying discontinuity in the SSI numbering with regard
  * to the Linux number of the devices */
 static const char *audmux_port_string(int port)
@@ -142,7 +136,7 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
 }
 
 static const struct file_operations audmux_debugfs_fops = {
-        .open = audmux_open_file,
+        .open = simple_open,
         .read = audmux_read_file,
         .llseek = default_llseek,
 };
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index 8fdc430a4f68..60bcba1bc30e 100644
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -55,9 +55,9 @@ static int mpc8610_hpcd_machine_probe(struct snd_soc_card *card)
 {
         struct mpc8610_hpcd_data *machine_data =
                 container_of(card, struct mpc8610_hpcd_data, card);
-        struct ccsr_guts_86xx __iomem *guts;
+        struct ccsr_guts __iomem *guts;
 
-        guts = ioremap(guts_phys, sizeof(struct ccsr_guts_86xx));
+        guts = ioremap(guts_phys, sizeof(struct ccsr_guts));
         if (!guts) {
                 dev_err(card->dev, "could not map global utilities\n");
                 return -ENOMEM;
@@ -139,9 +139,9 @@ static int mpc8610_hpcd_machine_remove(struct snd_soc_card *card)
 {
         struct mpc8610_hpcd_data *machine_data =
                 container_of(card, struct mpc8610_hpcd_data, card);
-        struct ccsr_guts_86xx __iomem *guts;
+        struct ccsr_guts __iomem *guts;
 
-        guts = ioremap(guts_phys, sizeof(struct ccsr_guts_86xx));
+        guts = ioremap(guts_phys, sizeof(struct ccsr_guts));
         if (!guts) {
                 dev_err(card->dev, "could not map global utilities\n");
                 return -ENOMEM;
diff --git a/sound/soc/fsl/p1022_ds.c b/sound/soc/fsl/p1022_ds.c
index 202298556ba7..50adf4032bcc 100644
--- a/sound/soc/fsl/p1022_ds.c
+++ b/sound/soc/fsl/p1022_ds.c
@@ -46,7 +46,7 @@
  * ch: The channel on the DMA controller (0, 1, 2, or 3)
  * device: The device to set as the target (CCSR_GUTS_DMUXCR_xxx)
  */
-static inline void guts_set_dmuxcr(struct ccsr_guts_85xx __iomem *guts,
+static inline void guts_set_dmuxcr(struct ccsr_guts __iomem *guts,
         unsigned int co, unsigned int ch, unsigned int device)
 {
         unsigned int shift = 16 + (8 * (1 - co) + 2 * (3 - ch));
@@ -87,9 +87,9 @@ static int p1022_ds_machine_probe(struct snd_soc_card *card)
 {
         struct machine_data *mdata =
                 container_of(card, struct machine_data, card);
-        struct ccsr_guts_85xx __iomem *guts;
+        struct ccsr_guts __iomem *guts;
 
-        guts = ioremap(guts_phys, sizeof(struct ccsr_guts_85xx));
+        guts = ioremap(guts_phys, sizeof(struct ccsr_guts));
         if (!guts) {
                 dev_err(card->dev, "could not map global utilities\n");
                 return -ENOMEM;
@@ -161,9 +161,9 @@ static int p1022_ds_machine_remove(struct snd_soc_card *card)
 {
         struct machine_data *mdata =
                 container_of(card, struct machine_data, card);
-        struct ccsr_guts_85xx __iomem *guts;
+        struct ccsr_guts __iomem *guts;
 
-        guts = ioremap(guts_phys, sizeof(struct ccsr_guts_85xx));
+        guts = ioremap(guts_phys, sizeof(struct ccsr_guts));
         if (!guts) {
                 dev_err(card->dev, "could not map global utilities\n");
                 return -ENOMEM;
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index a6922bc96184..8a17048dba42 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -200,12 +200,6 @@ static ssize_t pmdown_time_set(struct device *dev,
 static DEVICE_ATTR(pmdown_time, 0644, pmdown_time_show, pmdown_time_set);
 
 #ifdef CONFIG_DEBUG_FS
-static int codec_reg_open_file(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 static ssize_t codec_reg_read_file(struct file *file, char __user *user_buf,
                                    size_t count, loff_t *ppos)
 {
@@ -263,7 +257,7 @@ static ssize_t codec_reg_write_file(struct file *file,
 }
 
 static const struct file_operations codec_reg_fops = {
-        .open = codec_reg_open_file,
+        .open = simple_open,
         .read = codec_reg_read_file,
         .write = codec_reg_write_file,
         .llseek = default_llseek,
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 69e9452386e6..589e16b9a483 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -1538,12 +1538,6 @@ static int dapm_power_widgets(struct snd_soc_dapm_context *dapm, int event)
 }
 
 #ifdef CONFIG_DEBUG_FS
-static int dapm_widget_power_open_file(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 static ssize_t dapm_widget_power_read_file(struct file *file,
                                            char __user *user_buf,
                                            size_t count, loff_t *ppos)
@@ -1607,17 +1601,11 @@ static ssize_t dapm_widget_power_read_file(struct file *file,
 }
 
 static const struct file_operations dapm_widget_power_fops = {
-        .open = dapm_widget_power_open_file,
+        .open = simple_open,
         .read = dapm_widget_power_read_file,
         .llseek = default_llseek,
 };
 
-static int dapm_bias_open_file(struct inode *inode, struct file *file)
-{
-        file->private_data = inode->i_private;
-        return 0;
-}
-
 static ssize_t dapm_bias_read_file(struct file *file, char __user *user_buf,
                                    size_t count, loff_t *ppos)
 {
@@ -1648,7 +1636,7 @@ static ssize_t dapm_bias_read_file(struct file *file, char __user *user_buf,
 }
 
 static const struct file_operations dapm_bias_fops = {
-        .open = dapm_bias_open_file,
+        .open = simple_open,
         .read = dapm_bias_read_file,
         .llseek = default_llseek,
 };