From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ea0-f175.google.com ([209.85.215.175]:33259 "EHLO mail-ea0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750915AbaAELc2 (ORCPT ); Sun, 5 Jan 2014 06:32:28 -0500 Received: by mail-ea0-f175.google.com with SMTP id z10so7375715ead.20 for ; Sun, 05 Jan 2014 03:32:27 -0800 (PST) Message-ID: <52C9430F.4090408@googlemail.com> Date: Sun, 05 Jan 2014 12:33:35 +0100 From: =?ISO-8859-15?Q?Frank_Sch=E4fer?= MIME-Version: 1.0 To: Mauro Carvalho Chehab , unlisted-recipients:; CC: Linux Media Mailing List , Mauro Carvalho Chehab Subject: Re: [PATCH v4 14/22] [media] em28xx: unify module version References: <1388832951-11195-1-git-send-email-m.chehab@samsung.com> <1388832951-11195-15-git-send-email-m.chehab@samsung.com> In-Reply-To: <1388832951-11195-15-git-send-email-m.chehab@samsung.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org List-ID: Am 04.01.2014 11:55, schrieb Mauro Carvalho Chehab: > Use the same module version on all em28xx sub-modules, and use > the same naming convention to describe the driver. > > Signed-off-by: Mauro Carvalho Chehab > --- > drivers/media/usb/em28xx/em28xx-audio.c | 3 ++- > drivers/media/usb/em28xx/em28xx-core.c | 2 -- > drivers/media/usb/em28xx/em28xx-dvb.c | 4 +++- > drivers/media/usb/em28xx/em28xx-input.c | 3 ++- > drivers/media/usb/em28xx/em28xx-video.c | 4 +--- > drivers/media/usb/em28xx/em28xx.h | 1 + > 6 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/drivers/media/usb/em28xx/em28xx-audio.c b/drivers/media/usb/em28xx/em28xx-audio.c > index 263886adcf26..a6eef06ffdcd 100644 > --- a/drivers/media/usb/em28xx/em28xx-audio.c > +++ b/drivers/media/usb/em28xx/em28xx-audio.c > @@ -747,7 +747,8 @@ static void __exit em28xx_alsa_unregister(void) > MODULE_LICENSE("GPL"); > MODULE_AUTHOR("Markus Rechberger "); > MODULE_AUTHOR("Mauro Carvalho Chehab "); > -MODULE_DESCRIPTION("Em28xx Audio driver"); > +MODULE_DESCRIPTION(DRIVER_DESC " - audio interface"); > +MODULE_VERSION(EM28XX_VERSION); > > module_init(em28xx_alsa_register); > module_exit(em28xx_alsa_unregister); > diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c > index 36b2f1ab4474..2ad84ff1fc4f 100644 > --- a/drivers/media/usb/em28xx/em28xx-core.c > +++ b/drivers/media/usb/em28xx/em28xx-core.c > @@ -39,8 +39,6 @@ > "Mauro Carvalho Chehab , " \ > "Sascha Sommer " > > -#define DRIVER_DESC "Empia em28xx based USB core driver" > - > MODULE_AUTHOR(DRIVER_AUTHOR); > MODULE_DESCRIPTION(DRIVER_DESC); > MODULE_LICENSE("GPL"); > diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c > index f72663a9b5c5..7fa1c804c34c 100644 > --- a/drivers/media/usb/em28xx/em28xx-dvb.c > +++ b/drivers/media/usb/em28xx/em28xx-dvb.c > @@ -54,9 +54,11 @@ > #include "m88ds3103.h" > #include "m88ts2022.h" > > -MODULE_DESCRIPTION("driver for em28xx based DVB cards"); > MODULE_AUTHOR("Mauro Carvalho Chehab "); > MODULE_LICENSE("GPL"); > +MODULE_DESCRIPTION(DRIVER_DESC " - digital TV interface"); > +MODULE_VERSION(EM28XX_VERSION); > + > > static unsigned int debug; > module_param(debug, int, 0644); > diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c > index eed7dd79f734..f3b629dd57ae 100644 > --- a/drivers/media/usb/em28xx/em28xx-input.c > +++ b/drivers/media/usb/em28xx/em28xx-input.c > @@ -836,7 +836,8 @@ static void __exit em28xx_rc_unregister(void) > > MODULE_LICENSE("GPL"); > MODULE_AUTHOR("Mauro Carvalho Chehab "); > -MODULE_DESCRIPTION("Em28xx Input driver"); > +MODULE_DESCRIPTION(DRIVER_DESC " - input interface"); > +MODULE_VERSION(EM28XX_VERSION); > > module_init(em28xx_rc_register); > module_exit(em28xx_rc_unregister); > diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c > index 328d724a13ea..999cbfe766a3 100644 > --- a/drivers/media/usb/em28xx/em28xx-video.c > +++ b/drivers/media/usb/em28xx/em28xx-video.c > @@ -50,8 +50,6 @@ > "Mauro Carvalho Chehab , " \ > "Sascha Sommer " > > -#define DRIVER_DESC "Empia em28xx based USB video device driver" > - > static unsigned int isoc_debug; > module_param(isoc_debug, int, 0644); > MODULE_PARM_DESC(isoc_debug, "enable debug messages [isoc transfers]"); > @@ -78,7 +76,7 @@ do {\ > } while (0) > > MODULE_AUTHOR(DRIVER_AUTHOR); > -MODULE_DESCRIPTION(DRIVER_DESC); > +MODULE_DESCRIPTION(DRIVER_DESC " - v4l2 interface"); > MODULE_LICENSE("GPL"); > MODULE_VERSION(EM28XX_VERSION); > > diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h > index ac79501f5d9f..db47c2236ca4 100644 > --- a/drivers/media/usb/em28xx/em28xx.h > +++ b/drivers/media/usb/em28xx/em28xx.h > @@ -27,6 +27,7 @@ > #define _EM28XX_H > > #define EM28XX_VERSION "0.2.1" > +#define DRIVER_DESC "Empia em28xx device driver" > > #include > #include Looks much better now. :) Reviewed-by: Frank Schäfer