p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ALSA: asihpi: Remove always NULL parameter 

snd_asihpi_hpi_new() takes a pointer to a pointer of a hwdep where if this
parameter is provided the newly allocated hwdep is stored. All callers pass
NULL though, so remove the parameter. This makes the code a bit cleaner and
shorter.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Lars-Peter Clausen 2015-01-02 12:24:45 +01:00 committed by Takashi Iwai
parent a08800940f
commit d18132aa15
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/pci/asihpi/asihpi.c
View File

@ -2832,14 +2832,11 @@ static int snd_asihpi_hpi_ioctl(struct snd_hwdep *hw, struct file *file,
/* results in /dev/snd/hwC#D0 file for each card with index # /* results in /dev/snd/hwC#D0 file for each card with index #
also /proc/asound/hwdep will contain '#-00: asihpi (HPI) for each card' also /proc/asound/hwdep will contain '#-00: asihpi (HPI) for each card'
*/ */
static int snd_asihpi_hpi_new(struct snd_card_asihpi *asihpi, static int snd_asihpi_hpi_new(struct snd_card_asihpi *asihpi, int device)
int device, struct snd_hwdep **rhwdep)
{ {
struct snd_hwdep *hw; struct snd_hwdep *hw;
int err; int err;
if (rhwdep)
*rhwdep = NULL;
err = snd_hwdep_new(asihpi->card, "HPI", device, &hw); err = snd_hwdep_new(asihpi->card, "HPI", device, &hw);
if (err < 0) if (err < 0)
return err; return err;
@ -2849,8 +2846,6 @@ static int snd_asihpi_hpi_new(struct snd_card_asihpi *asihpi,
hw->ops.ioctl = snd_asihpi_hpi_ioctl; hw->ops.ioctl = snd_asihpi_hpi_ioctl;
hw->ops.release = snd_asihpi_hpi_release; hw->ops.release = snd_asihpi_hpi_release;
hw->private_data = asihpi; hw->private_data = asihpi;
if (rhwdep)
*rhwdep = hw;
return 0; return 0;
} }
@ -2993,7 +2988,7 @@ static int snd_asihpi_probe(struct pci_dev *pci_dev,
/* always create, can be enabled or disabled dynamically /* always create, can be enabled or disabled dynamically
by enable_hwdep module param*/ by enable_hwdep module param*/
snd_asihpi_hpi_new(asihpi, 0, NULL); snd_asihpi_hpi_new(asihpi, 0);
strcpy(card->driver, "ASIHPI"); strcpy(card->driver, "ASIHPI");