diff options
author | Joe Perches <joe@perches.com> | 2010-09-04 21:52:54 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-09-07 02:05:59 -0400 |
commit | 9fe856e47e1751204faf3d604c6d20ab24bd3b93 (patch) | |
tree | 744a735096a76caad69d73884893c897b0ce3219 /sound/pci | |
parent | 831853c87fb7234a8650484d30993242ea9ad6d3 (diff) |
sound: Remove unnecessary casts of private_data
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/emu10k1/emumpu401.c | 2 | ||||
-rw-r--r-- | sound/pci/ice1712/pontis.c | 6 | ||||
-rw-r--r-- | sound/pci/ice1712/prodigy192.c | 2 | ||||
-rw-r--r-- | sound/pci/rme96.c | 8 | ||||
-rw-r--r-- | sound/pci/rme9652/hdsp.c | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/sound/pci/emu10k1/emumpu401.c b/sound/pci/emu10k1/emumpu401.c index 8578c70c61f2..bab564824efe 100644 --- a/sound/pci/emu10k1/emumpu401.c +++ b/sound/pci/emu10k1/emumpu401.c | |||
@@ -321,7 +321,7 @@ static struct snd_rawmidi_ops snd_emu10k1_midi_input = | |||
321 | 321 | ||
322 | static void snd_emu10k1_midi_free(struct snd_rawmidi *rmidi) | 322 | static void snd_emu10k1_midi_free(struct snd_rawmidi *rmidi) |
323 | { | 323 | { |
324 | struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)rmidi->private_data; | 324 | struct snd_emu10k1_midi *midi = rmidi->private_data; |
325 | midi->interrupt = NULL; | 325 | midi->interrupt = NULL; |
326 | midi->rmidi = NULL; | 326 | midi->rmidi = NULL; |
327 | } | 327 | } |
diff --git a/sound/pci/ice1712/pontis.c b/sound/pci/ice1712/pontis.c index 6bc3f91b7281..cdb873f5da50 100644 --- a/sound/pci/ice1712/pontis.c +++ b/sound/pci/ice1712/pontis.c | |||
@@ -638,7 +638,7 @@ static struct snd_kcontrol_new pontis_controls[] __devinitdata = { | |||
638 | */ | 638 | */ |
639 | static void wm_proc_regs_write(struct snd_info_entry *entry, struct snd_info_buffer *buffer) | 639 | static void wm_proc_regs_write(struct snd_info_entry *entry, struct snd_info_buffer *buffer) |
640 | { | 640 | { |
641 | struct snd_ice1712 *ice = (struct snd_ice1712 *)entry->private_data; | 641 | struct snd_ice1712 *ice = entry->private_data; |
642 | char line[64]; | 642 | char line[64]; |
643 | unsigned int reg, val; | 643 | unsigned int reg, val; |
644 | mutex_lock(&ice->gpio_mutex); | 644 | mutex_lock(&ice->gpio_mutex); |
@@ -653,7 +653,7 @@ static void wm_proc_regs_write(struct snd_info_entry *entry, struct snd_info_buf | |||
653 | 653 | ||
654 | static void wm_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) | 654 | static void wm_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) |
655 | { | 655 | { |
656 | struct snd_ice1712 *ice = (struct snd_ice1712 *)entry->private_data; | 656 | struct snd_ice1712 *ice = entry->private_data; |
657 | int reg, val; | 657 | int reg, val; |
658 | 658 | ||
659 | mutex_lock(&ice->gpio_mutex); | 659 | mutex_lock(&ice->gpio_mutex); |
@@ -676,7 +676,7 @@ static void wm_proc_init(struct snd_ice1712 *ice) | |||
676 | 676 | ||
677 | static void cs_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) | 677 | static void cs_proc_regs_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) |
678 | { | 678 | { |
679 | struct snd_ice1712 *ice = (struct snd_ice1712 *)entry->private_data; | 679 | struct snd_ice1712 *ice = entry->private_data; |
680 | int reg, val; | 680 | int reg, val; |
681 | 681 | ||
682 | mutex_lock(&ice->gpio_mutex); | 682 | mutex_lock(&ice->gpio_mutex); |
diff --git a/sound/pci/ice1712/prodigy192.c b/sound/pci/ice1712/prodigy192.c index 2a8e5cd8f2d8..e36ddb94c382 100644 --- a/sound/pci/ice1712/prodigy192.c +++ b/sound/pci/ice1712/prodigy192.c | |||
@@ -654,7 +654,7 @@ static int prodigy192_ak4114_init(struct snd_ice1712 *ice) | |||
654 | static void stac9460_proc_regs_read(struct snd_info_entry *entry, | 654 | static void stac9460_proc_regs_read(struct snd_info_entry *entry, |
655 | struct snd_info_buffer *buffer) | 655 | struct snd_info_buffer *buffer) |
656 | { | 656 | { |
657 | struct snd_ice1712 *ice = (struct snd_ice1712 *)entry->private_data; | 657 | struct snd_ice1712 *ice = entry->private_data; |
658 | int reg, val; | 658 | int reg, val; |
659 | /* registers 0x0 - 0x14 */ | 659 | /* registers 0x0 - 0x14 */ |
660 | for (reg = 0; reg <= 0x15; reg++) { | 660 | for (reg = 0; reg <= 0x15; reg++) { |
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c index d19dc052c391..d5f5b440fc40 100644 --- a/sound/pci/rme96.c +++ b/sound/pci/rme96.c | |||
@@ -1527,14 +1527,14 @@ snd_rme96_free(void *private_data) | |||
1527 | static void | 1527 | static void |
1528 | snd_rme96_free_spdif_pcm(struct snd_pcm *pcm) | 1528 | snd_rme96_free_spdif_pcm(struct snd_pcm *pcm) |
1529 | { | 1529 | { |
1530 | struct rme96 *rme96 = (struct rme96 *) pcm->private_data; | 1530 | struct rme96 *rme96 = pcm->private_data; |
1531 | rme96->spdif_pcm = NULL; | 1531 | rme96->spdif_pcm = NULL; |
1532 | } | 1532 | } |
1533 | 1533 | ||
1534 | static void | 1534 | static void |
1535 | snd_rme96_free_adat_pcm(struct snd_pcm *pcm) | 1535 | snd_rme96_free_adat_pcm(struct snd_pcm *pcm) |
1536 | { | 1536 | { |
1537 | struct rme96 *rme96 = (struct rme96 *) pcm->private_data; | 1537 | struct rme96 *rme96 = pcm->private_data; |
1538 | rme96->adat_pcm = NULL; | 1538 | rme96->adat_pcm = NULL; |
1539 | } | 1539 | } |
1540 | 1540 | ||
@@ -1661,7 +1661,7 @@ static void | |||
1661 | snd_rme96_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) | 1661 | snd_rme96_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) |
1662 | { | 1662 | { |
1663 | int n; | 1663 | int n; |
1664 | struct rme96 *rme96 = (struct rme96 *)entry->private_data; | 1664 | struct rme96 *rme96 = entry->private_data; |
1665 | 1665 | ||
1666 | rme96->rcreg = readl(rme96->iobase + RME96_IO_CONTROL_REGISTER); | 1666 | rme96->rcreg = readl(rme96->iobase + RME96_IO_CONTROL_REGISTER); |
1667 | 1667 | ||
@@ -2348,7 +2348,7 @@ snd_rme96_probe(struct pci_dev *pci, | |||
2348 | if (err < 0) | 2348 | if (err < 0) |
2349 | return err; | 2349 | return err; |
2350 | card->private_free = snd_rme96_card_free; | 2350 | card->private_free = snd_rme96_card_free; |
2351 | rme96 = (struct rme96 *)card->private_data; | 2351 | rme96 = card->private_data; |
2352 | rme96->card = card; | 2352 | rme96->card = card; |
2353 | rme96->pci = pci; | 2353 | rme96->pci = pci; |
2354 | snd_card_set_dev(card, &pci->dev); | 2354 | snd_card_set_dev(card, &pci->dev); |
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index b92adef8e81e..599e09051663 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c | |||
@@ -3284,7 +3284,7 @@ static int snd_hdsp_create_controls(struct snd_card *card, struct hdsp *hdsp) | |||
3284 | static void | 3284 | static void |
3285 | snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) | 3285 | snd_hdsp_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer) |
3286 | { | 3286 | { |
3287 | struct hdsp *hdsp = (struct hdsp *) entry->private_data; | 3287 | struct hdsp *hdsp = entry->private_data; |
3288 | unsigned int status; | 3288 | unsigned int status; |
3289 | unsigned int status2; | 3289 | unsigned int status2; |
3290 | char *pref_sync_ref; | 3290 | char *pref_sync_ref; |
@@ -4566,7 +4566,7 @@ static int hdsp_get_peak(struct hdsp *hdsp, struct hdsp_peak_rms __user *peak_rm | |||
4566 | 4566 | ||
4567 | static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigned int cmd, unsigned long arg) | 4567 | static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigned int cmd, unsigned long arg) |
4568 | { | 4568 | { |
4569 | struct hdsp *hdsp = (struct hdsp *)hw->private_data; | 4569 | struct hdsp *hdsp = hw->private_data; |
4570 | void __user *argp = (void __user *)arg; | 4570 | void __user *argp = (void __user *)arg; |
4571 | int err; | 4571 | int err; |
4572 | 4572 | ||
@@ -5155,7 +5155,7 @@ static int snd_hdsp_free(struct hdsp *hdsp) | |||
5155 | 5155 | ||
5156 | static void snd_hdsp_card_free(struct snd_card *card) | 5156 | static void snd_hdsp_card_free(struct snd_card *card) |
5157 | { | 5157 | { |
5158 | struct hdsp *hdsp = (struct hdsp *) card->private_data; | 5158 | struct hdsp *hdsp = card->private_data; |
5159 | 5159 | ||
5160 | if (hdsp) | 5160 | if (hdsp) |
5161 | snd_hdsp_free(hdsp); | 5161 | snd_hdsp_free(hdsp); |
@@ -5181,7 +5181,7 @@ static int __devinit snd_hdsp_probe(struct pci_dev *pci, | |||
5181 | if (err < 0) | 5181 | if (err < 0) |
5182 | return err; | 5182 | return err; |
5183 | 5183 | ||
5184 | hdsp = (struct hdsp *) card->private_data; | 5184 | hdsp = card->private_data; |
5185 | card->private_free = snd_hdsp_card_free; | 5185 | card->private_free = snd_hdsp_card_free; |
5186 | hdsp->dev = dev; | 5186 | hdsp->dev = dev; |
5187 | hdsp->pci = pci; | 5187 | hdsp->pci = pci; |