Merge branch 'master' into tk71

[mv-sheeva.git] / sound / pci / ice1712 / pontis.c

diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c
index 6bc3f91b728149ef7ab180856bcfd46b6ef8397e..cdb873f5da50923fb2ca1a1ff43d57ecf0ff4d01 100644 (file)
--- a/sound/pci/ice1712/pontis.c
+++ b/sound/pci/ice1712/pontis.c
@@ -638,7 +638,7 @@ static struct snd_kcontrol_new pontis_controls[] __devinitdata = {
  */
 static void wm_proc_regs_write(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
 {
-       struct snd_ice1712 *ice = (struct snd_ice1712 *)entry->private_data;
+       struct snd_ice1712 *ice = entry->private_data;
        char line[64];
        unsigned int reg, val;
        mutex_lock(&ice->gpio_mutex);
@@ -653,7 +653,7 @@ static void wm_proc_regs_write(struct snd_info_entry *entry, struct snd_info_buf
 
 static void wm_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
 {
-       struct snd_ice1712 *ice = (struct snd_ice1712 *)entry->private_data;
+       struct snd_ice1712 *ice = entry->private_data;
        int reg, val;
 
        mutex_lock(&ice->gpio_mutex);
@@ -676,7 +676,7 @@ static void wm_proc_init(struct snd_ice1712 *ice)
 
 static void cs_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
 {
-       struct snd_ice1712 *ice = (struct snd_ice1712 *)entry->private_data;
+       struct snd_ice1712 *ice = entry->private_data;
        int reg, val;
 
        mutex_lock(&ice->gpio_mutex);