From patchwork Mon Mar 3 10:06:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 3753341 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 86A269F44A for ; Mon, 3 Mar 2014 10:15:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B70D8201EC for ; Mon, 3 Mar 2014 10:15:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA6B120396 for ; Mon, 3 Mar 2014 10:15:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754119AbaCCKPy (ORCPT ); Mon, 3 Mar 2014 05:15:54 -0500 Received: from bombadil.infradead.org ([198.137.202.9]:49337 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754008AbaCCKHx (ORCPT ); Mon, 3 Mar 2014 05:07:53 -0500 Received: from [201.74.152.26] (helo=smtp.w2.samsung.com) by bombadil.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKPmp-00078T-Id; Mon, 03 Mar 2014 10:07:51 +0000 Received: from mchehab by smtp.w2.samsung.com with local (Exim 4.80.1) (envelope-from ) id 1WKPmF-0006Xh-FU; Mon, 03 Mar 2014 07:07:15 -0300 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Linux Media Mailing List , Mauro Carvalho Chehab Subject: [PATCH 50/79] [media] drx-j: Avoid any regressions by preserving old behavior Date: Mon, 3 Mar 2014 07:06:44 -0300 Message-Id: <1393841233-24840-51-git-send-email-m.chehab@samsung.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1393841233-24840-1-git-send-email-m.chehab@samsung.com> References: <1393841233-24840-1-git-send-email-m.chehab@samsung.com> To: unlisted-recipients:; (no To-header on input) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 The version is initialized with zero at drx_driver.c. Keep it, in order to avoid the risk of causing any regression. While here, remove the drx_driver.h from drxj, as this is not required there. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/dvb-frontends/drx39xyj/drxj.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/media/dvb-frontends/drx39xyj/drxj.c b/drivers/media/dvb-frontends/drx39xyj/drxj.c index a06c45d92955..b92ca9013f55 100644 --- a/drivers/media/dvb-frontends/drx39xyj/drxj.c +++ b/drivers/media/dvb-frontends/drx39xyj/drxj.c @@ -39,7 +39,6 @@ INCLUDE FILES #include "drxj.h" #include "drxj_map.h" -#include "drx_driver.h" /*============================================================================*/ /*=== DEFINES ================================================================*/ @@ -20982,7 +20981,7 @@ static int drx_ctrl_version(struct drx_demod_instance *demod, { static char drx_driver_core_module_name[] = "Core driver"; static char drx_driver_core_version_text[] = - DRX_VERSIONSTRING(VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH); + DRX_VERSIONSTRING(0, 0, 0); static struct drx_version drx_driver_core_version; static struct drx_version_list drx_driver_core_version_list; @@ -21003,9 +21002,9 @@ static int drx_ctrl_version(struct drx_demod_instance *demod, /* Always fill in the information of the driver SW . */ drx_driver_core_version.module_type = DRX_MODULE_DRIVERCORE; drx_driver_core_version.module_name = drx_driver_core_module_name; - drx_driver_core_version.v_major = VERSION_MAJOR; - drx_driver_core_version.v_minor = VERSION_MINOR; - drx_driver_core_version.v_patch = VERSION_PATCH; + drx_driver_core_version.v_major = 0; + drx_driver_core_version.v_minor = 0; + drx_driver_core_version.v_patch = 0; drx_driver_core_version.v_string = drx_driver_core_version_text; drx_driver_core_version_list.version = &drx_driver_core_version;