From patchwork Tue Jun 28 01:50:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 922962 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5S1ok3h013551 for ; Tue, 28 Jun 2011 01:50:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755824Ab1F1BuZ (ORCPT ); Mon, 27 Jun 2011 21:50:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9256 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755959Ab1F1BuV (ORCPT ); Mon, 27 Jun 2011 21:50:21 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5S1oIr8017256 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 27 Jun 2011 21:50:18 -0400 Received: from [10.11.11.117] (vpn-11-117.rdu.redhat.com [10.11.11.117]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p5S1oFub025473; Mon, 27 Jun 2011 21:50:16 -0400 Message-ID: <4E093357.8070303@redhat.com> Date: Mon, 27 Jun 2011 22:50:15 -0300 From: Mauro Carvalho Chehab User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110419 Red Hat/3.1.10-1.el6_0 Thunderbird/3.1.10 MIME-Version: 1.0 To: Jean-Francois Moine CC: Linux Media Mailing List Subject: Re: [PATCH 00/14] Remove linux/version.h from most drivers/media References: <20110626130620.4b5ed679@pedra> <20110626201420.018490cd@tele> <4E07808C.9060105@redhat.com> <20110627124558.08cd8684@tele> In-Reply-To: <20110627124558.08cd8684@tele> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 28 Jun 2011 01:50:47 +0000 (UTC) Em 27-06-2011 07:45, Jean-Francois Moine escreveu: > 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) Hmm... So, you want to revert this change? commit 5943ba139182f6a3f27492efecb29b0a514b787f Author: Jean-François Moine Date: Tue May 17 04:03:51 2011 -0300 [media] gspca - main: Version change to 2.13 Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab If so, I prefer if you do it on a separate patch. > +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"); Ok, I'll add this change into the patch. > return 0; > } > static void __exit gspca_exit(void) > > --- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index e526aa3..739abd4 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@ -55,7 +55,7 @@ MODULE_AUTHOR("Jean-François Moine "); MODULE_DESCRIPTION("GSPCA USB Camera Driver"); MODULE_LICENSE("GPL"); -#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 12, 0) +#define DRIVER_VERSION_NUMBER KERNEL_VERSION(2, 13, 0) #ifdef GSPCA_DEBUG int gspca_debug = D_ERR | D_PROBE;