Commit 9e80ed64 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: bt87x: Allocate resources with device-managed APIs 

This patch converts the resource management in PCI bt87x driver with
devres as a clean up.  Each manual resource management is converted
with the corresponding devres helper, and the card object release is
managed now via card->private_free instead of a lowlevel snd_device.

This should give no user-visible functional changes.

Link: https://lore.kernel.org/r/20210715075941.23332-13-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8c5823ef

sound/pci/bt87x.c

+25 −73
Original line number Diff line number Diff line
@@ -656,23 +656,11 @@ static const struct snd_kcontrol_new snd_bt87x_capture_source = { 
	.put = snd_bt87x_capture_source_put,

};



static int snd_bt87x_free(struct snd_bt87x *chip)

static void snd_bt87x_free(struct snd_card *card)

{

	if (chip->mmio)

		snd_bt87x_stop(chip);

	if (chip->irq >= 0)

		free_irq(chip->irq, chip);

	iounmap(chip->mmio);

	pci_release_regions(chip->pci);

	pci_disable_device(chip->pci);

	kfree(chip);

	return 0;

}

	struct snd_bt87x *chip = card->private_data;



static int snd_bt87x_dev_free(struct snd_device *device)

{

	struct snd_bt87x *chip = device->device_data;

	return snd_bt87x_free(chip);

	snd_bt87x_stop(chip);

}



static int snd_bt87x_pcm(struct snd_bt87x *chip, int device, char *name)
@@ -694,43 +682,24 @@ static int snd_bt87x_pcm(struct snd_bt87x *chip, int device, char *name) 
}



static int snd_bt87x_create(struct snd_card *card,

			    struct pci_dev *pci,

			    struct snd_bt87x **rchip)

			    struct pci_dev *pci)

{

	struct snd_bt87x *chip;

	struct snd_bt87x *chip = card->private_data;

	int err;

	static const struct snd_device_ops ops = {

		.dev_free = snd_bt87x_dev_free

	};



	*rchip = NULL;



	err = pci_enable_device(pci);

	err = pcim_enable_device(pci);

	if (err < 0)

		return err;



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

	if (!chip) {

		pci_disable_device(pci);

		return -ENOMEM;

	}

	chip->card = card;

	chip->pci = pci;

	chip->irq = -1;

	spin_lock_init(&chip->reg_lock);



	err = pci_request_regions(pci, "Bt87x audio");

	if (err < 0) {

		kfree(chip);

		pci_disable_device(pci);

	err = pcim_iomap_regions(pci, 1 << 0, "Bt87x audio");

	if (err < 0)

		return err;

	}

	chip->mmio = pci_ioremap_bar(pci, 0);

	if (!chip->mmio) {

		dev_err(card->dev, "cannot remap io memory\n");

		err = -ENOMEM;

		goto fail;

	}

	chip->mmio = pcim_iomap_table(pci)[0];



	chip->reg_control = CTL_A_PWRDN | CTL_DA_ES2 |

			    CTL_PKTP_16 | (15 << CTL_DA_SDR_SHIFT);
@@ -739,26 +708,18 @@ static int snd_bt87x_create(struct snd_card *card, 
	snd_bt87x_writel(chip, REG_INT_MASK, 0);

	snd_bt87x_writel(chip, REG_INT_STAT, MY_INTERRUPTS);



	err = request_irq(pci->irq, snd_bt87x_interrupt, IRQF_SHARED,

			  KBUILD_MODNAME, chip);

	err = devm_request_irq(&pci->dev, pci->irq, snd_bt87x_interrupt,

			       IRQF_SHARED, KBUILD_MODNAME, chip);

	if (err < 0) {

		dev_err(card->dev, "cannot grab irq %d\n", pci->irq);

		goto fail;

		return err;

	}

	chip->irq = pci->irq;

	card->sync_irq = chip->irq;

	card->private_free = snd_bt87x_free;

	pci_set_master(pci);



	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);

	if (err < 0)

		goto fail;



	*rchip = chip;

	return 0;



fail:

	snd_bt87x_free(chip);

	return err;

}



#define BT_DEVICE(chip, subvend, subdev, id) \
@@ -868,14 +829,15 @@ static int snd_bt87x_probe(struct pci_dev *pci, 
		return -ENOENT;

	}



	err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,

			   0, &card);

	err = snd_devm_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,

				sizeof(*chip), &card);

	if (err < 0)

		return err;

	chip = card->private_data;



	err = snd_bt87x_create(card, pci, &chip);

	err = snd_bt87x_create(card, pci);

	if (err < 0)

		goto _error;

		return err;



	memcpy(&chip->board, &snd_bt87x_boards[boardid], sizeof(chip->board));
@@ -887,24 +849,24 @@ static int snd_bt87x_probe(struct pci_dev *pci, 


		err = snd_bt87x_pcm(chip, DEVICE_DIGITAL, "Bt87x Digital");

		if (err < 0)

			goto _error;

			return err;

	}

	if (!chip->board.no_analog) {

		err = snd_bt87x_pcm(chip, DEVICE_ANALOG, "Bt87x Analog");

		if (err < 0)

			goto _error;

			return err;

		err = snd_ctl_add(card, snd_ctl_new1(

				  &snd_bt87x_capture_volume, chip));

		if (err < 0)

			goto _error;

			return err;

		err = snd_ctl_add(card, snd_ctl_new1(

				  &snd_bt87x_capture_boost, chip));

		if (err < 0)

			goto _error;

			return err;

		err = snd_ctl_add(card, snd_ctl_new1(

				  &snd_bt87x_capture_source, chip));

		if (err < 0)

			goto _error;

			return err;

	}

	dev_info(card->dev, "bt87x%d: Using board %d, %sanalog, %sdigital "

		   "(rate %d Hz)\n", dev, boardid,
@@ -920,20 +882,11 @@ static int snd_bt87x_probe(struct pci_dev *pci, 


	err = snd_card_register(card);

	if (err < 0)

		goto _error;

		return err;



	pci_set_drvdata(pci, card);

	++dev;

	return 0;



_error:

	snd_card_free(card);

	return err;

}



static void snd_bt87x_remove(struct pci_dev *pci)

{

	snd_card_free(pci_get_drvdata(pci));

}



/* default entries for all Bt87x cards - it's not exported */
@@ -948,7 +901,6 @@ static struct pci_driver driver = { 
	.name = KBUILD_MODNAME,

	.id_table = snd_bt87x_ids,

	.probe = snd_bt87x_probe,

	.remove = snd_bt87x_remove,

};



static int __init alsa_card_bt87x_init(void)