From patchwork Tue Mar 20 14:10:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gianluca Gennari X-Patchwork-Id: 10420 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1S9zlf-0003GY-8j for patchwork@linuxtv.org; Tue, 20 Mar 2012 15:10:31 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp for id 1S9zle-0003ge-HD; Tue, 20 Mar 2012 15:10:30 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757104Ab2CTOK2 (ORCPT ); Tue, 20 Mar 2012 10:10:28 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:65321 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753229Ab2CTOK1 (ORCPT ); Tue, 20 Mar 2012 10:10:27 -0400 Received: by eaaq12 with SMTP id q12so30151eaa.19 for ; Tue, 20 Mar 2012 07:10:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=4F9vnuUwvMGO1IYivPAnHNGOqBXX3Jzl4EphOMrfj5I=; b=Hf3MI5Mv/3XajUQQIORDiYdutUKww+aaCmcxu2oIXiz5/5Ccm+LGL985dtZ3ASFyXV rmZfxMfpq4hhtGL7jXwPWOHE+f6LxVzJom8MvpUuDg5oN01NDD1XBFLudkjSVYR7lmIs MlrddbpbbY+CGDaHRwFW6QlIrFZ0VP6b7U4ziASddmmg/JKtuGA9+B8bZPkw82JqO5Yg d3cRtYbHn6EijjdMFBRESgvmu/xgFX3zsHVPXQqDOU+9nBjWrc7O1wIy5b6NCVYlIz4r YTZvcPUaW2Pxo9lqBwaQNGJHZaDUJKkY5aWlDUZb+TeuUMcD6qSLKszLeh/lDinGH1u6 60Hw== Received: by 10.213.35.135 with SMTP id p7mr57320ebd.61.1332252626070; Tue, 20 Mar 2012 07:10:26 -0700 (PDT) Received: from localhost.localdomain (93-50-34-119.ip150.fastwebnet.it. [93.50.34.119]) by mx.google.com with ESMTPS id e56sm5591936eea.11.2012.03.20.07.10.24 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 20 Mar 2012 07:10:25 -0700 (PDT) From: Gianluca Gennari To: linux-media@vger.kernel.org, mchehab@redhat.com Cc: Gianluca Gennari Subject: [PATCH] media_build: fix module_*_driver redefined warnings Date: Tue, 20 Mar 2012 15:10:17 +0100 Message-Id: <1332252617-3171-1-git-send-email-gennarone@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.3.20.140023 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FORGED_FROM_GMAIL 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1600_1699 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' The conditions "#ifndef module_usb_driver" and "#ifndef module_platform_driver" are always true, as the header files where this macros are defined are not included in compat.h (linux/usb.h and linux/platform_devices.h). This produces a lot of warnings like "module_usb_driver redefined" or "module_platform_driver redefined" with kernels 3.2 and 3.3. But including the header files in compat.h produces other "redefined" warnings, so let's check the kernel version instead. module_usb_driver was first introduced in kernel 3.3, while module_platform_driver was introduced in kernel 3.2. Tested with kernel 3.3, 3.2 and 3.0. Signed-off-by: Gianluca Gennari --- v4l/compat.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/v4l/compat.h b/v4l/compat.h index 62710c9..ab0f2e7 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -864,7 +864,7 @@ static inline int snd_ctl_enum_info(struct snd_ctl_elem_info *info, unsigned int #endif #endif /*pr_debug_ratelimited */ -#ifndef module_usb_driver +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) #define module_usb_driver(drv) \ static int __init usb_mod_init(void) \ { \ @@ -878,7 +878,7 @@ module_init(usb_mod_init); \ module_exit(usb_mod_exit); #endif /* module_usb_driver */ -#ifndef module_platform_driver +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) #define module_platform_driver(drv) \ static int __init plat_mod_init(void) \ { \