diff mbox series

[v4,10/10] sound: bt87x: use pci_status_get_and_clear_errors

Message ID 6362e866-9ce3-31f5-3357-9f086eedf11e@gmail.com
State New
Headers show
Series PCI: Add and use constant PCI_STATUS_ERROR_BITS and helper pci_status_get_and_clear_errors | expand

Commit Message

Heiner Kallweit Feb. 29, 2020, 10:29 p.m. UTC
Use new helper pci_status_get_and_clear_errors() to simplify the code.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 sound/pci/bt87x.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Takashi Iwai March 6, 2020, 6:06 a.m. UTC | #1
On Sat, 29 Feb 2020 23:29:07 +0100,
Heiner Kallweit wrote:
> 
> Use new helper pci_status_get_and_clear_errors() to simplify the code.
> 
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

Acked-by: Takashi Iwai <tiwai@suse.de>


thanks,

Takashi

> ---
>  sound/pci/bt87x.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
> index 8c48864c8..656750466 100644
> --- a/sound/pci/bt87x.c
> +++ b/sound/pci/bt87x.c
> @@ -271,13 +271,8 @@ static void snd_bt87x_free_risc(struct snd_bt87x *chip)
>  
>  static void snd_bt87x_pci_error(struct snd_bt87x *chip, unsigned int status)
>  {
> -	u16 pci_status;
> +	int pci_status = pci_status_get_and_clear_errors(chip->pci);
>  
> -	pci_read_config_word(chip->pci, PCI_STATUS, &pci_status);
> -	pci_status &= PCI_STATUS_PARITY | PCI_STATUS_SIG_TARGET_ABORT |
> -		PCI_STATUS_REC_TARGET_ABORT | PCI_STATUS_REC_MASTER_ABORT |
> -		PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_DETECTED_PARITY;
> -	pci_write_config_word(chip->pci, PCI_STATUS, pci_status);
>  	if (pci_status != PCI_STATUS_DETECTED_PARITY)
>  		dev_err(chip->card->dev,
>  			"Aieee - PCI error! status %#08x, PCI status %#04x\n",
> -- 
> 2.25.1
> 
>
diff mbox series

Patch

diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 8c48864c8..656750466 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -271,13 +271,8 @@  static void snd_bt87x_free_risc(struct snd_bt87x *chip)
 
 static void snd_bt87x_pci_error(struct snd_bt87x *chip, unsigned int status)
 {
-	u16 pci_status;
+	int pci_status = pci_status_get_and_clear_errors(chip->pci);
 
-	pci_read_config_word(chip->pci, PCI_STATUS, &pci_status);
-	pci_status &= PCI_STATUS_PARITY | PCI_STATUS_SIG_TARGET_ABORT |
-		PCI_STATUS_REC_TARGET_ABORT | PCI_STATUS_REC_MASTER_ABORT |
-		PCI_STATUS_SIG_SYSTEM_ERROR | PCI_STATUS_DETECTED_PARITY;
-	pci_write_config_word(chip->pci, PCI_STATUS, pci_status);
 	if (pci_status != PCI_STATUS_DETECTED_PARITY)
 		dev_err(chip->card->dev,
 			"Aieee - PCI error! status %#08x, PCI status %#04x\n",