Re: [PATCH 06/11] staging/lynxfb: Use pci aperture helper

[Thomas Zimmermann <tzimmermann@xxxxxxx>]

Hi

Am 11.01.23 um 16:41 schrieb Daniel Vetter:
> It exists! Note that since this is an exact copy, there shouldn't be
> any functional difference here.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
> Cc: Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>
> Cc: Teddy Wang <teddy.wang@xxxxxxxxxxxxxxxxx>
> Cc: linux-fbdev@xxxxxxxxxxxxxxx
> ---
>   drivers/staging/sm750fb/sm750.c | 16 +---------------
>   1 file changed, 1 insertion(+), 15 deletions(-)
>
> diff --git a/drivers/staging/sm750fb/sm750.c b/drivers/staging/sm750fb/sm750.c
> index effc7fcc3703..22ace3168723 100644
> --- a/drivers/staging/sm750fb/sm750.c
> +++ b/drivers/staging/sm750fb/sm750.c
> @@ -989,20 +989,6 @@ static int sm750fb_framebuffer_alloc(struct sm750_dev *sm750_dev, int fbidx)
>   	return err;
>   }
>   
> -static int lynxfb_kick_out_firmware_fb(struct pci_dev *pdev)
> -{
> -	resource_size_t base = pci_resource_start(pdev, 0);
> -	resource_size_t size = pci_resource_len(pdev, 0);
> -	bool primary = false;
> -
> -#ifdef CONFIG_X86
> -	primary = pdev->resource[PCI_ROM_RESOURCE].flags &
> -					IORESOURCE_ROM_SHADOW;
> -#endif
> -
> -	return aperture_remove_conflicting_devices(base, size, primary, "sm750_fb1");

This still had the primary argument, it needs to be handled in an early 
patch in some way.

> -}
> -
>   static int lynxfb_pci_probe(struct pci_dev *pdev,
>   			    const struct pci_device_id *ent)
>   {
> @@ -1011,7 +997,7 @@ static int lynxfb_pci_probe(struct pci_dev *pdev,
>   	int fbidx;
>   	int err;
>   
> -	err = lynxfb_kick_out_firmware_fb(pdev);
> +	err = aperture_remove_conflicting_pci_devices(pdev, "sm750_fb1");
>   	if (err)
>   		return err;
>   

--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev

Attachment: OpenPGP_signature
Description: OpenPGP digital signature