From patchwork Mon Jun 27 10:45:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jean-Francois Moine X-Patchwork-Id: 98 Return-path: Envelope-to: mchehab@pedra Delivery-date: Mon, 27 Jun 2011 09:04:17 -0300 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1QbAY4-00019B-FH for mchehab@pedra; Mon, 27 Jun 2011 09:04:16 -0300 Received: from casper.infradead.org [85.118.1.10] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Mon, 27 Jun 2011 09:04:16 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qb9T8-0001D2-Cu; Mon, 27 Jun 2011 10:55:06 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757246Ab1F0KqX (ORCPT + 1 other); Mon, 27 Jun 2011 06:46:23 -0400 Received: from smtp1-g21.free.fr ([212.27.42.1]:55316 "EHLO smtp1-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757432Ab1F0Koh convert rfc822-to-8bit (ORCPT ); Mon, 27 Jun 2011 06:44:37 -0400 Received: from tele (unknown [IPv6:2a01:e35:2f5c:9de0:212:bfff:fe1e:8db5]) by smtp1-g21.free.fr (Postfix) with ESMTP id C8253940182; Mon, 27 Jun 2011 12:44:30 +0200 (CEST) Date: Mon, 27 Jun 2011 12:45:58 +0200 From: Jean-Francois Moine To: Mauro Carvalho Chehab Cc: Linux Media Mailing List Subject: Re: [PATCH 00/14] Remove linux/version.h from most drivers/media Message-ID: <20110627124558.08cd8684@tele> In-Reply-To: <4E07808C.9060105@redhat.com> References: <20110626130620.4b5ed679@pedra> <20110626201420.018490cd@tele> <4E07808C.9060105@redhat.com> X-Mailer: Claws Mail 3.7.9 (GTK+ 2.24.4; x86_64-pc-linux-gnu) Mime-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: On Sun, 26 Jun 2011 15:55:08 -0300 Mauro Carvalho Chehab wrote: > I'll move it to the right changeset at the version 2 of this series. Hi Mauro, I have some changes to the gspca.c patch - the version must stay 2.12.0 - the 'info' may be simplified: diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index e526aa3..1aa6ae2 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@ -24,7 +24,6 @@ #define MODULE_NAME "gspca" #include -#include #include #include #include @@ -51,11 +50,12 @@ #error "DEF_NURBS too big" #endif +#define DRIVER_VERSION_NUMBER "2.12.0" + MODULE_AUTHOR("Jean-François Moine "); MODULE_DESCRIPTION("GSPCA USB Camera Driver"); MODULE_LICENSE("GPL"); - -#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 12, 0) +MODULE_VERSION(DRIVER_VERSION_NUMBER); #ifdef GSPCA_DEBUG int gspca_debug = D_ERR | D_PROBE; @@ -1291,7 +1291,6 @@ static int vidioc_querycap(struct file *file, void *priv, } usb_make_path(gspca_dev->dev, (char *) cap->bus_info, sizeof(cap->bus_info)); - cap->version = DRIVER_VERSION_NUMBER; cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | V4L2_CAP_READWRITE; @@ -2478,10 +2477,7 @@ EXPORT_SYMBOL(gspca_auto_gain_n_exposure); /* -- module insert / remove -- */ static int __init gspca_init(void) { - info("v%d.%d.%d registered", - (DRIVER_VERSION_NUMBER >> 16) & 0xff, - (DRIVER_VERSION_NUMBER >> 8) & 0xff, - DRIVER_VERSION_NUMBER & 0xff); + info("v" DRIVER_VERSION_NUMBER " registered"); return 0; } static void __exit gspca_exit(void)