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

Commit 927fc866 authored by Pavel Machek's avatar Pavel Machek Committed by Jaroslav Kysela
Browse files

[ALSA] sound/pci/hda/intel_hda: small cleanups 



Cleanup whitespace.

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 929861c6

sound/pci/hda/hda_intel.c

+27 −25
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static int azx_reset(struct azx *chip) 
	while (!azx_readb(chip, GCTL) && --count)

		msleep(1);



	/* Brent Chartrand said to wait >= 540us for codecs to intialize */

	/* Brent Chartrand said to wait >= 540us for codecs to initialize */

	msleep(1);



	/* check to see if controller is ready */
@@ -1018,8 +1018,9 @@ static struct snd_pcm_hardware azx_pcm_hw = { 
	.info =			(SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |

				 SNDRV_PCM_INFO_BLOCK_TRANSFER |

				 SNDRV_PCM_INFO_MMAP_VALID |

				 SNDRV_PCM_INFO_PAUSE /*|*/

				 /*SNDRV_PCM_INFO_RESUME*/),

				 /* No full-resume yet implemented */

				 /* SNDRV_PCM_INFO_RESUME |*/

				 SNDRV_PCM_INFO_PAUSE),

	.formats =		SNDRV_PCM_FMTBIT_S16_LE,

	.rates =		SNDRV_PCM_RATE_48000,

	.rate_min =		48000,
@@ -1454,19 +1455,19 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci, 
				struct azx **rchip)

{

	struct azx *chip;

	int err = 0;

	int err;

	static struct snd_device_ops ops = {

		.dev_free = azx_dev_free,

	};



	*rchip = NULL;

	

	if ((err = pci_enable_device(pci)) < 0)

	err = pci_enable_device(pci);

	if (err < 0)

		return err;



	chip = kzalloc(sizeof(*chip), GFP_KERNEL);

	

	if (NULL == chip) {

	if (!chip) {

		snd_printk(KERN_ERR SFX "cannot allocate chip\n");

		pci_disable_device(pci);

		return -ENOMEM;
@@ -1492,7 +1493,8 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci, 
	}

#endif



	if ((err = pci_request_regions(pci, "ICH HD audio")) < 0) {

	err = pci_request_regions(pci, "ICH HD audio");

	if (err < 0) {

		kfree(chip);

		pci_disable_device(pci);

		return err;
@@ -1600,16 +1602,16 @@ static int __devinit azx_probe(struct pci_dev *pci, const struct pci_device_id * 
{

	struct snd_card *card;

	struct azx *chip;

	int err = 0;

	int err;



	card = snd_card_new(index, id, THIS_MODULE, 0);

	if (NULL == card) {

	if (!card) {

		snd_printk(KERN_ERR SFX "Error creating card!\n");

		return -ENOMEM;

	}



	if ((err = azx_create(card, pci, pci_id->driver_data,

			      &chip)) < 0) {

	err = azx_create(card, pci, pci_id->driver_data, &chip);

	if (err < 0) {

		snd_card_free(card);

		return err;

	}