Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fe856e4 authored by Joe Perches's avatar Joe Perches Committed by Takashi Iwai
Browse files

sound: Remove unnecessary casts of private_data 



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 831853c8

sound/core/oss/mixer_oss.c

+11 −11
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int snd_mixer_oss_release(struct inode *inode, struct file *file) 
	struct snd_mixer_oss_file *fmixer;



	if (file->private_data) {

		fmixer = (struct snd_mixer_oss_file *) file->private_data;

		fmixer = file->private_data;

		module_put(fmixer->card->module);

		snd_card_file_remove(fmixer->card, file);

		kfree(fmixer);
@@ -368,7 +368,7 @@ static int snd_mixer_oss_ioctl1(struct snd_mixer_oss_file *fmixer, unsigned int 


static long snd_mixer_oss_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

	return snd_mixer_oss_ioctl1((struct snd_mixer_oss_file *) file->private_data, cmd, arg);

	return snd_mixer_oss_ioctl1(file->private_data, cmd, arg);

}



int snd_mixer_oss_ioctl_card(struct snd_card *card, unsigned int cmd, unsigned long arg)
@@ -582,7 +582,7 @@ static int snd_mixer_oss_get_volume1(struct snd_mixer_oss_file *fmixer, 
				     struct snd_mixer_oss_slot *pslot,

				     int *left, int *right)

{

	struct slot *slot = (struct slot *)pslot->private_data;

	struct slot *slot = pslot->private_data;

	

	*left = *right = 100;

	if (slot->present & SNDRV_MIXER_OSS_PRESENT_PVOLUME) {
@@ -691,7 +691,7 @@ static int snd_mixer_oss_put_volume1(struct snd_mixer_oss_file *fmixer, 
				     struct snd_mixer_oss_slot *pslot,

				     int left, int right)

{

	struct slot *slot = (struct slot *)pslot->private_data;

	struct slot *slot = pslot->private_data;

	

	if (slot->present & SNDRV_MIXER_OSS_PRESENT_PVOLUME) {

		snd_mixer_oss_put_volume1_vol(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_PVOLUME], left, right);
@@ -740,7 +740,7 @@ static int snd_mixer_oss_get_recsrc1_sw(struct snd_mixer_oss_file *fmixer, 
					struct snd_mixer_oss_slot *pslot,

					int *active)

{

	struct slot *slot = (struct slot *)pslot->private_data;

	struct slot *slot = pslot->private_data;

	int left, right;

	

	left = right = 1;
@@ -753,7 +753,7 @@ static int snd_mixer_oss_get_recsrc1_route(struct snd_mixer_oss_file *fmixer, 
					   struct snd_mixer_oss_slot *pslot,

					   int *active)

{

	struct slot *slot = (struct slot *)pslot->private_data;

	struct slot *slot = pslot->private_data;

	int left, right;

	

	left = right = 1;
@@ -766,7 +766,7 @@ static int snd_mixer_oss_put_recsrc1_sw(struct snd_mixer_oss_file *fmixer, 
					struct snd_mixer_oss_slot *pslot,

					int active)

{

	struct slot *slot = (struct slot *)pslot->private_data;

	struct slot *slot = pslot->private_data;

	

	snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_CSWITCH], active, active, 0);

	return 0;
@@ -776,7 +776,7 @@ static int snd_mixer_oss_put_recsrc1_route(struct snd_mixer_oss_file *fmixer, 
					   struct snd_mixer_oss_slot *pslot,

					   int active)

{

	struct slot *slot = (struct slot *)pslot->private_data;

	struct slot *slot = pslot->private_data;

	

	snd_mixer_oss_put_volume1_sw(fmixer, pslot, slot->numid[SNDRV_MIXER_OSS_ITEM_CROUTE], active, active, 1);

	return 0;
@@ -813,7 +813,7 @@ static int snd_mixer_oss_get_recsrc2(struct snd_mixer_oss_file *fmixer, unsigned 
		if (!(mixer->mask_recsrc & (1 << idx)))

			continue;

		pslot = &mixer->slots[idx];

		slot = (struct slot *)pslot->private_data;

		slot = pslot->private_data;

		if (slot->signature != SNDRV_MIXER_OSS_SIGNATURE)

			continue;

		if (!(slot->present & SNDRV_MIXER_OSS_PRESENT_CAPTURE))
@@ -861,7 +861,7 @@ static int snd_mixer_oss_put_recsrc2(struct snd_mixer_oss_file *fmixer, unsigned 
		if (!(mixer->mask_recsrc & (1 << idx)))

			continue;

		pslot = &mixer->slots[idx];

		slot = (struct slot *)pslot->private_data;

		slot = pslot->private_data;

		if (slot->signature != SNDRV_MIXER_OSS_SIGNATURE)

			continue;

		if (!(slot->present & SNDRV_MIXER_OSS_PRESENT_CAPTURE))
@@ -925,7 +925,7 @@ static int snd_mixer_oss_build_test(struct snd_mixer_oss *mixer, struct slot *sl 


static void snd_mixer_oss_slot_free(struct snd_mixer_oss_slot *chn)

{

	struct slot *p = (struct slot *)chn->private_data;

	struct slot *p = chn->private_data;

	if (p) {

		if (p->allocated && p->assigned) {

			kfree(p->assigned->name);

sound/core/pcm.c

+1 −2
Original line number Diff line number Diff line
@@ -364,8 +364,7 @@ static void snd_pcm_stream_proc_info_read(struct snd_info_entry *entry, 
static void snd_pcm_substream_proc_info_read(struct snd_info_entry *entry,

					     struct snd_info_buffer *buffer)

{

	snd_pcm_proc_info_read((struct snd_pcm_substream *)entry->private_data,

			       buffer);

	snd_pcm_proc_info_read(entry->private_data, buffer);

}



static void snd_pcm_substream_proc_hw_params_read(struct snd_info_entry *entry,

sound/drivers/virmidi.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int __devinit snd_virmidi_probe(struct platform_device *devptr) 
			      sizeof(struct snd_card_virmidi), &card);

	if (err < 0)

		return err;

	vmidi = (struct snd_card_virmidi *)card->private_data;

	vmidi = card->private_data;

	vmidi->card = card;



	if (midi_devs[dev] > MAX_MIDI_DEVICES) {

sound/i2c/other/ak4xxx-adda.c

+1 −1
Original line number Diff line number Diff line
@@ -878,7 +878,7 @@ static int build_deemphasis(struct snd_akm4xxx *ak, int num_emphs) 
static void proc_regs_read(struct snd_info_entry *entry,

		struct snd_info_buffer *buffer)

{

	struct snd_akm4xxx *ak = (struct snd_akm4xxx *)entry->private_data;

	struct snd_akm4xxx *ak = entry->private_data;

	int reg, val, chip;

	for (chip = 0; chip < ak->num_chips; chip++) {

		for (reg = 0; reg < ak->total_regs; reg++) {

sound/isa/ad1816a/ad1816a.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard 
				sizeof(struct snd_card_ad1816a), &card);

	if (error < 0)

		return error;

	acard = (struct snd_card_ad1816a *)card->private_data;

	acard = card->private_data;



	if ((error = snd_card_ad1816a_pnp(dev, acard, pcard, pid))) {

		snd_card_free(card);