From patchwork Thu May 5 11:07:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 9023551 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 961759F30C for ; Thu, 5 May 2016 11:08:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C86FC203C1 for ; Thu, 5 May 2016 11:08:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB2422013D for ; Thu, 5 May 2016 11:08:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753003AbcEELHx (ORCPT ); Thu, 5 May 2016 07:07:53 -0400 Received: from lists.s-osg.org ([54.187.51.154]:46360 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752377AbcEELHw (ORCPT ); Thu, 5 May 2016 07:07:52 -0400 Received: from recife.lan (unknown [186.213.240.20]) by lists.s-osg.org (Postfix) with ESMTPSA id 66877E289E; Thu, 5 May 2016 04:08:02 -0700 (PDT) Date: Thu, 5 May 2016 08:07:37 -0300 From: Mauro Carvalho Chehab To: Stefan Lippers-Hollmann Cc: Linus Torvalds , Linux Media Mailing List , Linux Kernel Mailing List Subject: Re: [GIT PULL for v4.6-rc1] media updates Message-ID: <20160505080737.5961617e@recife.lan> In-Reply-To: <20160505010051.5b4149c8@mir> References: <20160315080552.3cc5d146@recife.lan> <20160503233859.0f6506fa@mir> <20160504063902.0af2f4d7@mir> <20160504212845.21dab7c8@mir> <20160504185112.70ea985b@recife.lan> <20160505010051.5b4149c8@mir> Organization: Samsung X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-9.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_TVD_MIME_EPI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Em Thu, 5 May 2016 01:00:51 +0200 Stefan Lippers-Hollmann escreveu: > Hi > > On 2016-05-04, Mauro Carvalho Chehab wrote: > > Em Wed, 4 May 2016 13:49:52 -0700 > > Linus Torvalds escreveu: > > > On Wed, May 4, 2016 at 12:28 PM, Stefan Lippers-Hollmann wrote: > [...] > > Stefan, > > > > Could you please test the enclosed patch? > > > > Regards, > > Mauro > > > > [media] media-device: fix builds when USB or PCI is compiled as module > > > > Just checking ifdef CONFIG_USB is not enough, if the USB is compiled > > as module. The same applies to PCI. > > > > Compile-tested only. > > > > So, change the logic to use, instead, IS_REACHABLE. > > > > Signed-off-by: Mauro Carvalho Chehab > > > > diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c > > index b84825715f98..8c1f80ff33e3 100644 > > --- a/drivers/media/media-device.c > > +++ b/drivers/media/media-device.c > > @@ -842,11 +842,11 @@ struct media_device *media_device_find_devres(struct device *dev) > > } > > EXPORT_SYMBOL_GPL(media_device_find_devres); > > > > +#if IS_REACHABLE(CONFIG_PCI) > > void media_device_pci_init(struct media_device *mdev, > > struct pci_dev *pci_dev, > > const char *name) > > { > > -#ifdef CONFIG_PCI > > mdev->dev = &pci_dev->dev; > > > > if (name) > > @@ -862,16 +862,16 @@ void media_device_pci_init(struct media_device *mdev, > > mdev->driver_version = LINUX_VERSION_CODE; > > > > media_device_init(mdev); > > -#endif > > } > > EXPORT_SYMBOL_GPL(media_device_pci_init); > > +#endif > > > > +#if IS_REACHABLE(CONFIG_USB) > > void __media_device_usb_init(struct media_device *mdev, > > struct usb_device *udev, > > const char *board_name, > > const char *driver_name) > > { > > -#ifdef CONFIG_USB > > mdev->dev = &udev->dev; > > > > if (driver_name) > > @@ -891,9 +891,9 @@ void __media_device_usb_init(struct media_device *mdev, > > mdev->driver_version = LINUX_VERSION_CODE; > > > > media_device_init(mdev); > > -#endif > > } > > EXPORT_SYMBOL_GPL(__media_device_usb_init); > > +#endif > > > > > > #endif /* CONFIG_MEDIA_CONTROLLER */ > > > > > > This fails to build for me with: > > [...] > Setup is 16348 bytes (padded to 16384 bytes). > System is 3319 kB > CRC a9178215 > Kernel: arch/x86/boot/bzImage is ready (#1) > ERROR: "__media_device_usb_init" [drivers/media/usb/siano/smsusb.ko] undefined! > ERROR: "__media_device_usb_init" [drivers/media/usb/em28xx/em28xx.ko] undefined! > ERROR: "__media_device_usb_init" [drivers/media/usb/dvb-usb/dvb-usb.ko] undefined! > ERROR: "__media_device_usb_init" [drivers/media/usb/dvb-usb-v2/dvb_usb_v2.ko] undefined! > ERROR: "__media_device_usb_init" [drivers/media/usb/cx231xx/cx231xx.ko] undefined! > ERROR: "__media_device_usb_init" [drivers/media/usb/au0828/au0828.ko] undefined! > scripts/Makefile.modpost:91: recipe for target '__modpost' failed > make[6]: *** [__modpost] Error 1 > Makefile:1147: recipe for target 'modules' failed > [...] > > I've attached my gzipped kernel configs for amd64 and i386. > > Regards > Stefan Lippers-Hollmann Oh, in this case, it should be using IS_ENABLED() macro instead. The following patch should fix it. I tested here with some different setups, as described in the patch, and with your .i686 .config. Please double-check and ack if it is ok for you. Regards, Mauro [PATCH v2] [media] media-device: fix builds when USB or PCI is compiled as module Just checking ifdef CONFIG_USB is not enough, if the USB is compiled as module. The same applies to PCI. Tested with the following .config alternatives: CONFIG_USB=m CONFIG_MEDIA_CONTROLLER=y CONFIG_MEDIA_SUPPORT=m CONFIG_VIDEO_AU0828=m CONFIG_USB=m CONFIG_MEDIA_CONTROLLER=y CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_AU0828=m CONFIG_USB=y CONFIG_MEDIA_CONTROLLER=y CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_AU0828=m CONFIG_USB=y CONFIG_MEDIA_CONTROLLER=y CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_AU0828=y Signed-off-by: Mauro Carvalho Chehab Thanks, Mauro Tested-by: Stefan Lippers-Hollmann diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 6e43c95629ea..3cfd7af8c5ca 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -846,11 +846,11 @@ struct media_device *media_device_find_devres(struct device *dev) } EXPORT_SYMBOL_GPL(media_device_find_devres); +#if IS_ENABLED(CONFIG_PCI) void media_device_pci_init(struct media_device *mdev, struct pci_dev *pci_dev, const char *name) { -#ifdef CONFIG_PCI mdev->dev = &pci_dev->dev; if (name) @@ -866,16 +866,16 @@ void media_device_pci_init(struct media_device *mdev, mdev->driver_version = LINUX_VERSION_CODE; media_device_init(mdev); -#endif } EXPORT_SYMBOL_GPL(media_device_pci_init); +#endif +#if IS_ENABLED(CONFIG_USB) void __media_device_usb_init(struct media_device *mdev, struct usb_device *udev, const char *board_name, const char *driver_name) { -#ifdef CONFIG_USB mdev->dev = &udev->dev; if (driver_name) @@ -895,9 +895,9 @@ void __media_device_usb_init(struct media_device *mdev, mdev->driver_version = LINUX_VERSION_CODE; media_device_init(mdev); -#endif } EXPORT_SYMBOL_GPL(__media_device_usb_init); +#endif #endif /* CONFIG_MEDIA_CONTROLLER */