hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALSA: fm801: store struct device instead of pci_dev 

There is no need to store struct pci_dev in struct fm801. Generic struct device
can be easily translated to struct pci_dev whenever it's needed, in particular
for one user for now.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Andy Shevchenko 2015-12-18 21:14:13 +02:00 committed by Takashi Iwai
parent 997c87dad2
commit d3d33aabac
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/pci/fm801.c
View File

@ -163,6 +163,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device numbers");
* @cap_ctrl: capture control * @cap_ctrl: capture control
*/ */
struct fm801 { struct fm801 {
struct device *dev;
int irq; int irq;
unsigned long port; unsigned long port;
@ -190,7 +191,6 @@ struct fm801 {
struct snd_ac97 *ac97; struct snd_ac97 *ac97;
struct snd_ac97 *ac97_sec; struct snd_ac97 *ac97_sec;
struct pci_dev *pci;
struct snd_card *card; struct snd_card *card;
struct snd_pcm *pcm; struct snd_pcm *pcm;
struct snd_rawmidi *rmidi; struct snd_rawmidi *rmidi;
@ -715,6 +715,7 @@ static struct snd_pcm_ops snd_fm801_capture_ops = {
static int snd_fm801_pcm(struct fm801 *chip, int device) static int snd_fm801_pcm(struct fm801 *chip, int device)
{ {
struct pci_dev *pdev = to_pci_dev(chip->dev);
struct snd_pcm *pcm; struct snd_pcm *pcm;
int err; int err;
@ -730,7 +731,7 @@ static int snd_fm801_pcm(struct fm801 *chip, int device)
chip->pcm = pcm; chip->pcm = pcm;
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
snd_dma_pci_data(chip->pci), snd_dma_pci_data(pdev),
chip->multichannel ? 128*1024 : 64*1024, 128*1024); chip->multichannel ? 128*1024 : 64*1024, 128*1024);
return snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK, return snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,
@ -1182,7 +1183,7 @@ static int snd_fm801_free(struct fm801 *chip)
cmdw |= 0x00c3; cmdw |= 0x00c3;
fm801_writew(chip, IRQ_MASK, cmdw); fm801_writew(chip, IRQ_MASK, cmdw);
devm_free_irq(&chip->pci->dev, chip->irq, chip); devm_free_irq(chip->dev, chip->irq, chip);
__end_hw: __end_hw:
#ifdef CONFIG_SND_FM801_TEA575X_BOOL #ifdef CONFIG_SND_FM801_TEA575X_BOOL
@ -1220,7 +1221,7 @@ static int snd_fm801_create(struct snd_card *card,
return -ENOMEM; return -ENOMEM;
spin_lock_init(&chip->reg_lock); spin_lock_init(&chip->reg_lock);
chip->card = card; chip->card = card;
chip->pci = pci; chip->dev = &pci->dev;
chip->irq = -1; chip->irq = -1;
chip->tea575x_tuner = tea575x_tuner; chip->tea575x_tuner = tea575x_tuner;
if ((err = pci_request_regions(pci, "FM801")) < 0) if ((err = pci_request_regions(pci, "FM801")) < 0)