evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Cleanup whitespace.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Pavel Machek 2006-08-31 17:03:43 +02:00 • committed by Jaroslav Kysela
parent 929861c669
commit 927fc86602
1 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sound/pci/hda/hda_intel.c
View file

@ -664,7 +664,7 @@ static int azx_reset(struct azx *chip)
while (!azx_readb(chip, GCTL) && --count) while (!azx_readb(chip, GCTL) && --count)
msleep(1); msleep(1);
/* Brent Chartrand said to wait >= 540us for codecs to intialize */ /* Brent Chartrand said to wait >= 540us for codecs to initialize */
msleep(1); msleep(1);
/* check to see if controller is ready */ /* 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 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_BLOCK_TRANSFER |
SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_PAUSE /*|*/ /* No full-resume yet implemented */
/*SNDRV_PCM_INFO_RESUME*/), /* SNDRV_PCM_INFO_RESUME |*/
SNDRV_PCM_INFO_PAUSE),
.formats = SNDRV_PCM_FMTBIT_S16_LE, .formats = SNDRV_PCM_FMTBIT_S16_LE,
.rates = SNDRV_PCM_RATE_48000, .rates = SNDRV_PCM_RATE_48000,
.rate_min = 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 **rchip)
{ {
struct azx *chip; struct azx *chip;
int err = 0; int err;
static struct snd_device_ops ops = { static struct snd_device_ops ops = {
.dev_free = azx_dev_free, .dev_free = azx_dev_free,
}; };
*rchip = NULL; *rchip = NULL;
if ((err = pci_enable_device(pci)) < 0) err = pci_enable_device(pci);
if (err < 0)
return err; return err;
chip = kzalloc(sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (!chip) {
if (NULL == chip) {
snd_printk(KERN_ERR SFX "cannot allocate chip\n"); snd_printk(KERN_ERR SFX "cannot allocate chip\n");
pci_disable_device(pci); pci_disable_device(pci);
return -ENOMEM; return -ENOMEM;
@ -1492,7 +1493,8 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
} }
#endif #endif
if ((err = pci_request_regions(pci, "ICH HD audio")) < 0) { err = pci_request_regions(pci, "ICH HD audio");
if (err < 0) {
kfree(chip); kfree(chip);
pci_disable_device(pci); pci_disable_device(pci);
return err; 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 snd_card *card;
struct azx *chip; struct azx *chip;
int err = 0; int err;
card = snd_card_new(index, id, THIS_MODULE, 0); card = snd_card_new(index, id, THIS_MODULE, 0);
if (NULL == card) { if (!card) {
snd_printk(KERN_ERR SFX "Error creating card!\n"); snd_printk(KERN_ERR SFX "Error creating card!\n");
return -ENOMEM; return -ENOMEM;
} }
if ((err = azx_create(card, pci, pci_id->driver_data, err = azx_create(card, pci, pci_id->driver_data, &chip);
&chip)) < 0) { if (err < 0) {
snd_card_free(card); snd_card_free(card);
return err; return err;
} }