Skip to content

Commit

Permalink
ALSA: hda - Remove superfluous memory allocation error messages
Browse files Browse the repository at this point in the history
The memory allocators should have already given the kernel warning
messages, thus we don't have to annoy again.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Mar 3, 2015
1 parent 6efdd85 commit f4de8fe
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 30 deletions.
16 changes: 4 additions & 12 deletions sound/pci/hda/hda_codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -776,10 +776,8 @@ int snd_hda_bus_new(struct snd_card *card,
*busp = NULL;

bus = kzalloc(sizeof(*bus), GFP_KERNEL);
if (bus == NULL) {
dev_err(card->dev, "can't allocate struct hda_bus\n");
if (!bus)
return -ENOMEM;
}

bus->card = card;
mutex_init(&bus->cmd_mutex);
Expand Down Expand Up @@ -1223,10 +1221,8 @@ int snd_hda_codec_new(struct hda_bus *bus, struct snd_card *card,
}

codec = kzalloc(sizeof(*codec), GFP_KERNEL);
if (codec == NULL) {
dev_err(card->dev, "can't allocate struct hda_codec\n");
if (!codec)
return -ENOMEM;
}

dev = hda_codec_dev(codec);
device_initialize(dev);
Expand Down Expand Up @@ -1307,10 +1303,8 @@ int snd_hda_codec_new(struct hda_bus *bus, struct snd_card *card,

fg = codec->afg ? codec->afg : codec->mfg;
err = read_widget_caps(codec, fg);
if (err < 0) {
dev_err(card->dev, "cannot malloc\n");
if (err < 0)
goto error;
}
err = read_pin_defaults(codec);
if (err < 0)
goto error;
Expand Down Expand Up @@ -1371,10 +1365,8 @@ int snd_hda_codec_update_widgets(struct hda_codec *codec)
kfree(codec->wcaps);
fg = codec->afg ? codec->afg : codec->mfg;
err = read_widget_caps(codec, fg);
if (err < 0) {
codec_err(codec, "cannot malloc\n");
if (err < 0)
return err;
}

snd_array_free(&codec->init_pins);
err = read_pin_defaults(codec);
Expand Down
18 changes: 4 additions & 14 deletions sound/pci/hda/hda_controller.c
Original file line number Diff line number Diff line change
Expand Up @@ -974,14 +974,9 @@ static int azx_attach_pcm_stream(struct hda_bus *bus, struct hda_codec *codec,
*/
static int azx_alloc_cmd_io(struct azx *chip)
{
int err;

/* single page (at least 4096 bytes) must suffice for both ringbuffes */
err = chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV,
PAGE_SIZE, &chip->rb);
if (err < 0)
dev_err(chip->card->dev, "cannot allocate CORB/RIRB\n");
return err;
return chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV,
PAGE_SIZE, &chip->rb);
}
EXPORT_SYMBOL_GPL(azx_alloc_cmd_io);

Expand Down Expand Up @@ -1472,26 +1467,21 @@ static void azx_load_dsp_cleanup(struct hda_bus *bus,
int azx_alloc_stream_pages(struct azx *chip)
{
int i, err;
struct snd_card *card = chip->card;

for (i = 0; i < chip->num_streams; i++) {
dsp_lock_init(&chip->azx_dev[i]);
/* allocate memory for the BDL for each stream */
err = chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV,
BDL_SIZE,
&chip->azx_dev[i].bdl);
if (err < 0) {
dev_err(card->dev, "cannot allocate BDL\n");
if (err < 0)
return -ENOMEM;
}
}
/* allocate memory for the position buffer */
err = chip->ops->dma_alloc_pages(chip, SNDRV_DMA_TYPE_DEV,
chip->num_streams * 8, &chip->posbuf);
if (err < 0) {
dev_err(card->dev, "cannot allocate posbuf\n");
if (err < 0)
return -ENOMEM;
}

/* allocate CORB/RIRB */
err = azx_alloc_cmd_io(chip);
Expand Down
5 changes: 1 addition & 4 deletions sound/pci/hda/hda_intel.c
Original file line number Diff line number Diff line change
Expand Up @@ -1383,7 +1383,6 @@ static int azx_create(struct snd_card *card, struct pci_dev *pci,

hda = kzalloc(sizeof(*hda), GFP_KERNEL);
if (!hda) {
dev_err(card->dev, "Cannot allocate hda\n");
pci_disable_device(pci);
return -ENOMEM;
}
Expand Down Expand Up @@ -1564,10 +1563,8 @@ static int azx_first_init(struct azx *chip)
chip->num_streams = chip->playback_streams + chip->capture_streams;
chip->azx_dev = kcalloc(chip->num_streams, sizeof(*chip->azx_dev),
GFP_KERNEL);
if (!chip->azx_dev) {
dev_err(card->dev, "cannot malloc azx_dev\n");
if (!chip->azx_dev)
return -ENOMEM;
}

err = azx_alloc_stream_pages(chip);
if (err < 0)
Expand Down

0 comments on commit f4de8fe

Please sign in to comment.