video: fbdev: pvr2fb: fix link error for pvr2fb_pci_exit

Message ID 20190617131624.2382303-1-arnd@arndb.de
State New
Headers show
Series
  • video: fbdev: pvr2fb: fix link error for pvr2fb_pci_exit
Related show

Commit Message

Arnd Bergmann June 17, 2019, 1:16 p.m.
When the driver is built-in for PCI, we reference the exit function
after discarding it:

`pvr2fb_pci_exit' referenced in section `.ref.data' of drivers/video/fbdev/pvr2fb.o: defined in discarded section `.exit.text' of drivers/video/fbdev/pvr2fb.o

Just remove the __exit annotation as the easiest workaround.

Fixes: 0f5a5712ad1e ("video: fbdev: pvr2fb: add COMPILE_TEST support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/video/fbdev/pvr2fb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.20.0

Comments

Bartlomiej Zolnierkiewicz June 21, 2019, 10:58 a.m. | #1
Hi,

On 6/17/19 3:16 PM, Arnd Bergmann wrote:
> When the driver is built-in for PCI, we reference the exit function

> after discarding it:

> 

> `pvr2fb_pci_exit' referenced in section `.ref.data' of drivers/video/fbdev/pvr2fb.o: defined in discarded section `.exit.text' of drivers/video/fbdev/pvr2fb.o

> 

> Just remove the __exit annotation as the easiest workaround.


Don't we also need to fix pvr2fb_dc_exit() for CONFIG_SH_DREAMCAST=y case? 

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

> Fixes: 0f5a5712ad1e ("video: fbdev: pvr2fb: add COMPILE_TEST support")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  drivers/video/fbdev/pvr2fb.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c

> index 299ea7db9220..cf9cfdc5e685 100644

> --- a/drivers/video/fbdev/pvr2fb.c

> +++ b/drivers/video/fbdev/pvr2fb.c

> @@ -990,7 +990,7 @@ static int __init pvr2fb_pci_init(void)

>  	return pci_register_driver(&pvr2fb_pci_driver);

>  }

>  

> -static void __exit pvr2fb_pci_exit(void)

> +static void pvr2fb_pci_exit(void)

>  {

>  	pci_unregister_driver(&pvr2fb_pci_driver);

>  }
Arnd Bergmann June 21, 2019, 11:05 a.m. | #2
On Fri, Jun 21, 2019 at 12:58 PM Bartlomiej Zolnierkiewicz
<b.zolnierkie@samsung.com> wrote:
>

> On 6/17/19 3:16 PM, Arnd Bergmann wrote:

> > When the driver is built-in for PCI, we reference the exit function

> > after discarding it:

> >

> > `pvr2fb_pci_exit' referenced in section `.ref.data' of drivers/video/fbdev/pvr2fb.o: defined in discarded section `.exit.text' of drivers/video/fbdev/pvr2fb.o

> >

> > Just remove the __exit annotation as the easiest workaround.

>

> Don't we also need to fix pvr2fb_dc_exit() for CONFIG_SH_DREAMCAST=y case?


I think that's correct, yes. Can you fix that up when applying the patch?

     Arnd
Bartlomiej Zolnierkiewicz June 21, 2019, 11:23 a.m. | #3
On 6/21/19 1:05 PM, Arnd Bergmann wrote:
> On Fri, Jun 21, 2019 at 12:58 PM Bartlomiej Zolnierkiewicz

> <b.zolnierkie@samsung.com> wrote:

>>

>> On 6/17/19 3:16 PM, Arnd Bergmann wrote:

>>> When the driver is built-in for PCI, we reference the exit function

>>> after discarding it:

>>>

>>> `pvr2fb_pci_exit' referenced in section `.ref.data' of drivers/video/fbdev/pvr2fb.o: defined in discarded section `.exit.text' of drivers/video/fbdev/pvr2fb.o

>>>

>>> Just remove the __exit annotation as the easiest workaround.

>>

>> Don't we also need to fix pvr2fb_dc_exit() for CONFIG_SH_DREAMCAST=y case?

> 

> I think that's correct, yes. Can you fix that up when applying the patch?


Sure.

I've queued the patch for v5.3, thanks!

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

Patch

diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c
index 299ea7db9220..cf9cfdc5e685 100644
--- a/drivers/video/fbdev/pvr2fb.c
+++ b/drivers/video/fbdev/pvr2fb.c
@@ -990,7 +990,7 @@  static int __init pvr2fb_pci_init(void)
 	return pci_register_driver(&pvr2fb_pci_driver);
 }
 
-static void __exit pvr2fb_pci_exit(void)
+static void pvr2fb_pci_exit(void)
 {
 	pci_unregister_driver(&pvr2fb_pci_driver);
 }