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

Commit 4ee3bffc authored by Joe Perches's avatar Joe Perches Committed by Takashi Iwai
Browse files

ALSA: Convert dev_printk(KERN_<LEVEL> to dev_<level>( 



dev_<level> calls take less code than dev_printk(KERN_<LEVEL>
and reducing object size is good.
Coalesce multiline formats for easier grep.
Coalesce segmented single line formats too.

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

sound/pci/asihpi/hpidspcd.c

+9 −13
Original line number Diff line number Diff line
@@ -49,14 +49,12 @@ short hpi_dsp_code_open(u32 adapter, void *os_data, struct dsp_code *dsp_code, 
	err = request_firmware(&firmware, fw_name, &dev->dev);



	if (err || !firmware) {

		dev_printk(KERN_ERR, &dev->dev,

			"%d, request_firmware failed for  %s\n", err,

			fw_name);

		dev_err(&dev->dev, "%d, request_firmware failed for %s\n",

			err, fw_name);

		goto error1;

	}

	if (firmware->size < sizeof(header)) {

		dev_printk(KERN_ERR, &dev->dev, "Header size too small %s\n",

			fw_name);

		dev_err(&dev->dev, "Header size too small %s\n", fw_name);

		goto error2;

	}

	memcpy(&header, firmware->data, sizeof(header));
@@ -64,7 +62,7 @@ short hpi_dsp_code_open(u32 adapter, void *os_data, struct dsp_code *dsp_code, 
	if ((header.type != 0x45444F43) ||	/* "CODE" */

		(header.adapter != adapter)

		|| (header.size != firmware->size)) {

		dev_printk(KERN_ERR, &dev->dev,

		dev_err(&dev->dev,

			"Invalid firmware header size %d != file %zd\n",

			header.size, firmware->size);

		goto error2;
@@ -72,15 +70,13 @@ short hpi_dsp_code_open(u32 adapter, void *os_data, struct dsp_code *dsp_code, 


	if ((header.version >> 9) != (HPI_VER >> 9)) {

		/* Consider even and subsequent odd minor versions to be compatible */

		dev_printk(KERN_ERR, &dev->dev,

			"Incompatible firmware version "

			"DSP image %X != Driver %X\n", header.version,

			HPI_VER);

		dev_err(&dev->dev, "Incompatible firmware version DSP image %X != Driver %X\n",

			header.version, HPI_VER);

		goto error2;

	}



	if (header.version != HPI_VER) {

		dev_printk(KERN_INFO, &dev->dev,

		dev_info(&dev->dev,

			 "Firmware: release version mismatch  DSP image %X != Driver %X\n",

			 header.version, HPI_VER);

	}

sound/pci/asihpi/hpioctl.c

+8 −9
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev, 
		pci_dev->subsystem_device, pci_dev->devfn);



	if (pci_enable_device(pci_dev) < 0) {

		dev_printk(KERN_ERR, &pci_dev->dev,

		dev_err(&pci_dev->dev,

			"pci_enable_device failed, disabling device\n");

		return -EIO;

	}
@@ -398,8 +398,7 @@ int __devinit asihpi_adapter_probe(struct pci_dev *pci_dev, 
	mutex_init(&adapters[adapter_index].mutex);

	pci_set_drvdata(pci_dev, &adapters[adapter_index]);



	dev_printk(KERN_INFO, &pci_dev->dev,

		"probe succeeded for ASI%04X HPI index %d\n",

	dev_info(&pci_dev->dev, "probe succeeded for ASI%04X HPI index %d\n",

		 adapter.adapter->type, adapter_index);



	return 0;
@@ -448,8 +447,8 @@ void __devexit asihpi_adapter_remove(struct pci_dev *pci_dev) 


	pci_set_drvdata(pci_dev, NULL);

	if (1)

		dev_printk(KERN_INFO, &pci_dev->dev,

			"remove %04x:%04x,%04x:%04x,%04x," " HPI index %d.\n",

		dev_info(&pci_dev->dev,

			 "remove %04x:%04x,%04x:%04x,%04x, HPI index %d\n",

			 pci_dev->vendor, pci_dev->device,

			 pci_dev->subsystem_vendor, pci_dev->subsystem_device,

			 pci_dev->devfn, pa->adapter->index);