[PATCH 2/5] ALSA: hda/intel: Use pci_get_base_class() to reduce duplicated code

Takashi Iwai tiwai at suse.de
Fri Aug 25 07:48:07 UTC 2023


On Fri, 25 Aug 2023 08:27:11 +0200,
Sui Jingfeng wrote:
> 
> From: Sui Jingfeng <suijingfeng at loongson.cn>
> 
> Should be no functional change
> 
> Cc: Jaroslav Kysela <perex at perex.cz>
> Cc: Takashi Iwai <tiwai at suse.com>
> Cc: Fred Oh <fred.oh at linux.intel.com>
> Cc: Pierre-Louis Bossart <pierre-louis.bossart at linux.intel.com>
> Cc: Kai Vehmanen <kai.vehmanen at linux.intel.com>
> Cc: Bjorn Helgaas <bhelgaas at google.com>
> Signed-off-by: Sui Jingfeng <suijingfeng at loongson.cn>
> ---
>  sound/pci/hda/hda_intel.c | 16 +++++-----------
>  1 file changed, 5 insertions(+), 11 deletions(-)
> 
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index a21b61ad08d1..811a149584f2 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -1429,17 +1429,11 @@ static bool atpx_present(void)
>  	acpi_handle dhandle, atpx_handle;
>  	acpi_status status;
>  
> -	while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
> -		dhandle = ACPI_HANDLE(&pdev->dev);
> -		if (dhandle) {
> -			status = acpi_get_handle(dhandle, "ATPX", &atpx_handle);
> -			if (ACPI_SUCCESS(status)) {
> -				pci_dev_put(pdev);
> -				return true;
> -			}
> -		}
> -	}
> -	while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {
> +	while ((pdev = pci_get_base_class(PCI_BASE_CLASS_DISPLAY, pdev))) {
> +		if ((pdev->class != PCI_CLASS_DISPLAY_VGA << 8) &&
> +		    (pdev->class != PCI_CLASS_DISPLAY_OTHER << 8))
> +			continue;
> +
>  		dhandle = ACPI_HANDLE(&pdev->dev);
>  		if (dhandle) {
>  			status = acpi_get_handle(dhandle, "ATPX", &atpx_handle);

Reviewed-by: Takashi Iwai <tiwai at suse.de>


thanks,

Takashi


More information about the dri-devel mailing list