| Message ID | 1343329027-96369-1-git-send-email-tim.gardner@canonical.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Acked-By: Mike Isely <isely@pobox.com> -Mike On Thu, 26 Jul 2012, Tim Gardner wrote: > Cc: Mike Isely <isely@pobox.com> > Cc: Mauro Carvalho Chehab <mchehab@infradead.org> > Cc: linux-media@vger.kernel.org > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > drivers/media/video/pvrusb2/pvrusb2-devattr.c | 17 ++++++++++++----- > 1 file changed, 12 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c > index d8c8982..adc501d3 100644 > --- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c > +++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c > @@ -54,8 +54,9 @@ static const struct pvr2_device_client_desc pvr2_cli_29xxx[] = { > { .module_id = PVR2_CLIENT_ID_DEMOD }, > }; > > +#define PVR2_FIRMWARE_29xxx "v4l-pvrusb2-29xxx-01.fw" > static const char *pvr2_fw1_names_29xxx[] = { > - "v4l-pvrusb2-29xxx-01.fw", > + PVR2_FIRMWARE_29xxx, > }; > > static const struct pvr2_device_desc pvr2_device_29xxx = { > @@ -87,8 +88,9 @@ static const struct pvr2_device_client_desc pvr2_cli_24xxx[] = { > { .module_id = PVR2_CLIENT_ID_DEMOD }, > }; > > +#define PVR2_FIRMWARE_24xxx "v4l-pvrusb2-24xxx-01.fw" > static const char *pvr2_fw1_names_24xxx[] = { > - "v4l-pvrusb2-24xxx-01.fw", > + PVR2_FIRMWARE_24xxx, > }; > > static const struct pvr2_device_desc pvr2_device_24xxx = { > @@ -369,8 +371,9 @@ static const struct pvr2_device_client_desc pvr2_cli_73xxx[] = { > .i2c_address_list = "\x42"}, > }; > > +#define PVR2_FIRMWARE_73xxx "v4l-pvrusb2-73xxx-01.fw" > static const char *pvr2_fw1_names_73xxx[] = { > - "v4l-pvrusb2-73xxx-01.fw", > + PVR2_FIRMWARE_73xxx, > }; > > static const struct pvr2_device_desc pvr2_device_73xxx = { > @@ -475,8 +478,9 @@ static const struct pvr2_dvb_props pvr2_751xx_dvb_props = { > }; > #endif > > +#define PVR2_FIRMWARE_75xxx "v4l-pvrusb2-73xxx-01.fw" > static const char *pvr2_fw1_names_75xxx[] = { > - "v4l-pvrusb2-73xxx-01.fw", > + PVR2_FIRMWARE_75xxx, > }; > > static const struct pvr2_device_desc pvr2_device_750xx = { > @@ -556,7 +560,10 @@ struct usb_device_id pvr2_device_table[] = { > }; > > MODULE_DEVICE_TABLE(usb, pvr2_device_table); > - > +MODULE_FIRMWARE(PVR2_FIRMWARE_29xxx); > +MODULE_FIRMWARE(PVR2_FIRMWARE_24xxx); > +MODULE_FIRMWARE(PVR2_FIRMWARE_73xxx); > +MODULE_FIRMWARE(PVR2_FIRMWARE_75xxx); > > /* > Stuff for Emacs to see, in order to encourage consistent editing style: >
diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c index d8c8982..adc501d3 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c +++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c @@ -54,8 +54,9 @@ static const struct pvr2_device_client_desc pvr2_cli_29xxx[] = { { .module_id = PVR2_CLIENT_ID_DEMOD }, }; +#define PVR2_FIRMWARE_29xxx "v4l-pvrusb2-29xxx-01.fw" static const char *pvr2_fw1_names_29xxx[] = { - "v4l-pvrusb2-29xxx-01.fw", + PVR2_FIRMWARE_29xxx, }; static const struct pvr2_device_desc pvr2_device_29xxx = { @@ -87,8 +88,9 @@ static const struct pvr2_device_client_desc pvr2_cli_24xxx[] = { { .module_id = PVR2_CLIENT_ID_DEMOD }, }; +#define PVR2_FIRMWARE_24xxx "v4l-pvrusb2-24xxx-01.fw" static const char *pvr2_fw1_names_24xxx[] = { - "v4l-pvrusb2-24xxx-01.fw", + PVR2_FIRMWARE_24xxx, }; static const struct pvr2_device_desc pvr2_device_24xxx = { @@ -369,8 +371,9 @@ static const struct pvr2_device_client_desc pvr2_cli_73xxx[] = { .i2c_address_list = "\x42"}, }; +#define PVR2_FIRMWARE_73xxx "v4l-pvrusb2-73xxx-01.fw" static const char *pvr2_fw1_names_73xxx[] = { - "v4l-pvrusb2-73xxx-01.fw", + PVR2_FIRMWARE_73xxx, }; static const struct pvr2_device_desc pvr2_device_73xxx = { @@ -475,8 +478,9 @@ static const struct pvr2_dvb_props pvr2_751xx_dvb_props = { }; #endif +#define PVR2_FIRMWARE_75xxx "v4l-pvrusb2-73xxx-01.fw" static const char *pvr2_fw1_names_75xxx[] = { - "v4l-pvrusb2-73xxx-01.fw", + PVR2_FIRMWARE_75xxx, }; static const struct pvr2_device_desc pvr2_device_750xx = { @@ -556,7 +560,10 @@ struct usb_device_id pvr2_device_table[] = { }; MODULE_DEVICE_TABLE(usb, pvr2_device_table); - +MODULE_FIRMWARE(PVR2_FIRMWARE_29xxx); +MODULE_FIRMWARE(PVR2_FIRMWARE_24xxx); +MODULE_FIRMWARE(PVR2_FIRMWARE_73xxx); +MODULE_FIRMWARE(PVR2_FIRMWARE_75xxx); /* Stuff for Emacs to see, in order to encourage consistent editing style:
Cc: Mike Isely <isely@pobox.com> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: linux-media@vger.kernel.org Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- drivers/media/video/pvrusb2/pvrusb2-devattr.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)