From: Antti Palosaari <crope@iki.fi>
To: "Rémi Cardona" <remi.cardona@smartjog.com>
Cc: linux-media@vger.kernel.org, liplianin@me.by
Subject: Re: [PATCH 7/7] [media] dw2102: Declare MODULE_FIRMWARE usage
Date: Wed, 03 Oct 2012 03:41:55 +0300 [thread overview]
Message-ID: <506B89D3.7030405@iki.fi> (raw)
In-Reply-To: <1348837172-11784-8-git-send-email-remi.cardona@smartjog.com>
On 09/28/2012 03:59 PM, Rémi Cardona wrote:
> Signed-off-by: Rémi Cardona <remi.cardona@smartjog.com>
Reviewed-by: Antti Palosaari <crope@iki.fi>
> ---
> drivers/media/usb/dvb-usb/dw2102.c | 36 ++++++++++++++++++++++++++----------
> 1 file changed, 26 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
> index 9382895..937c744 100644
> --- a/drivers/media/usb/dvb-usb/dw2102.c
> +++ b/drivers/media/usb/dvb-usb/dw2102.c
> @@ -80,6 +80,15 @@
> #define DW2102_RC_QUERY (0x1a00)
> #define DW2102_LED_CTRL (0x1b00)
>
> +#define DW2101_FIRMWARE "dvb-usb-dw2101.fw"
> +#define DW2102_FIRMWARE "dvb-usb-dw2102.fw"
> +#define DW2104_FIRMWARE "dvb-usb-dw2104.fw"
> +#define DW3101_FIRMWARE "dvb-usb-dw3101.fw"
> +#define S630_FIRMWARE "dvb-usb-s630.fw"
> +#define S660_FIRMWARE "dvb-usb-s660.fw"
> +#define P1100_FIRMWARE "dvb-usb-p1100.fw"
> +#define P7500_FIRMWARE "dvb-usb-p7500.fw"
> +
> #define err_str "did not find the firmware file. (%s) " \
> "Please see linux/Documentation/dvb/ for more details " \
> "on firmware-problems."
> @@ -1478,13 +1487,12 @@ static int dw2102_load_firmware(struct usb_device *dev,
> u8 reset;
> u8 reset16[] = {0, 0, 0, 0, 0, 0, 0};
> const struct firmware *fw;
> - const char *fw_2101 = "dvb-usb-dw2101.fw";
>
> switch (dev->descriptor.idProduct) {
> case 0x2101:
> - ret = request_firmware(&fw, fw_2101, &dev->dev);
> + ret = request_firmware(&fw, DW2101_FIRMWARE, &dev->dev);
> if (ret != 0) {
> - err(err_str, fw_2101);
> + err(err_str, DW2101_FIRMWARE);
> return ret;
> }
> break;
> @@ -1586,7 +1594,7 @@ static int dw2102_load_firmware(struct usb_device *dev,
> static struct dvb_usb_device_properties dw2102_properties = {
> .caps = DVB_USB_IS_AN_I2C_ADAPTER,
> .usb_ctrl = DEVICE_SPECIFIC,
> - .firmware = "dvb-usb-dw2102.fw",
> + .firmware = DW2102_FIRMWARE,
> .no_reconnect = 1,
>
> .i2c_algo = &dw2102_serit_i2c_algo,
> @@ -1641,7 +1649,7 @@ static struct dvb_usb_device_properties dw2102_properties = {
> static struct dvb_usb_device_properties dw2104_properties = {
> .caps = DVB_USB_IS_AN_I2C_ADAPTER,
> .usb_ctrl = DEVICE_SPECIFIC,
> - .firmware = "dvb-usb-dw2104.fw",
> + .firmware = DW2104_FIRMWARE,
> .no_reconnect = 1,
>
> .i2c_algo = &dw2104_i2c_algo,
> @@ -1691,7 +1699,7 @@ static struct dvb_usb_device_properties dw2104_properties = {
> static struct dvb_usb_device_properties dw3101_properties = {
> .caps = DVB_USB_IS_AN_I2C_ADAPTER,
> .usb_ctrl = DEVICE_SPECIFIC,
> - .firmware = "dvb-usb-dw3101.fw",
> + .firmware = DW3101_FIRMWARE,
> .no_reconnect = 1,
>
> .i2c_algo = &dw3101_i2c_algo,
> @@ -1739,7 +1747,7 @@ static struct dvb_usb_device_properties s6x0_properties = {
> .caps = DVB_USB_IS_AN_I2C_ADAPTER,
> .usb_ctrl = DEVICE_SPECIFIC,
> .size_of_priv = sizeof(struct s6x0_state),
> - .firmware = "dvb-usb-s630.fw",
> + .firmware = S630_FIRMWARE,
> .no_reconnect = 1,
>
> .i2c_algo = &s6x0_i2c_algo,
> @@ -1879,7 +1887,7 @@ static int dw2102_probe(struct usb_interface *intf,
> return -ENOMEM;
> /* copy default structure */
> /* fill only different fields */
> - p1100->firmware = "dvb-usb-p1100.fw";
> + p1100->firmware = P1100_FIRMWARE;
> p1100->devices[0] = d1100;
> p1100->rc.legacy.rc_map_table = rc_map_tbs_table;
> p1100->rc.legacy.rc_map_size = ARRAY_SIZE(rc_map_tbs_table);
> @@ -1891,7 +1899,7 @@ static int dw2102_probe(struct usb_interface *intf,
> kfree(p1100);
> return -ENOMEM;
> }
> - s660->firmware = "dvb-usb-s660.fw";
> + s660->firmware = S660_FIRMWARE;
> s660->num_device_descs = 3;
> s660->devices[0] = d660;
> s660->devices[1] = d480_1;
> @@ -1905,7 +1913,7 @@ static int dw2102_probe(struct usb_interface *intf,
> kfree(s660);
> return -ENOMEM;
> }
> - p7500->firmware = "dvb-usb-p7500.fw";
> + p7500->firmware = P7500_FIRMWARE;
> p7500->devices[0] = d7500;
> p7500->rc.legacy.rc_map_table = rc_map_tbs_table;
> p7500->rc.legacy.rc_map_size = ARRAY_SIZE(rc_map_tbs_table);
> @@ -1949,3 +1957,11 @@ MODULE_DESCRIPTION("Driver for DVBWorld DVB-S 2101, 2102, DVB-S2 2104,"
> " Geniatech SU3000 devices");
> MODULE_VERSION("0.1");
> MODULE_LICENSE("GPL");
> +MODULE_FIRMWARE(DW2101_FIRMWARE);
> +MODULE_FIRMWARE(DW2102_FIRMWARE);
> +MODULE_FIRMWARE(DW2104_FIRMWARE);
> +MODULE_FIRMWARE(DW3101_FIRMWARE);
> +MODULE_FIRMWARE(S630_FIRMWARE);
> +MODULE_FIRMWARE(S660_FIRMWARE);
> +MODULE_FIRMWARE(P1100_FIRMWARE);
> +MODULE_FIRMWARE(P7500_FIRMWARE);
>
--
http://palosaari.fi/
prev parent reply other threads:[~2012-10-03 0:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1348837172-11784-1-git-send-email-remi.cardona@smartjog.com>
2012-10-01 10:15 ` [PATCH v3 0/7] ds3000/dw2102 improvements Rémi Cardona
2012-10-03 0:34 ` Antti Palosaari
[not found] ` <1348837172-11784-2-git-send-email-remi.cardona@smartjog.com>
2012-10-03 0:36 ` [PATCH 1/7] [media] ds3000: Declare MODULE_FIRMWARE usage Antti Palosaari
[not found] ` <1348837172-11784-3-git-send-email-remi.cardona@smartjog.com>
2012-10-03 0:37 ` [PATCH 2/7] [media] ds3000: remove useless 'locking' Antti Palosaari
[not found] ` <1348837172-11784-4-git-send-email-remi.cardona@smartjog.com>
2012-10-03 0:37 ` [PATCH 3/7] [media] ds3000: properly report register read errors Antti Palosaari
[not found] ` <1348837172-11784-5-git-send-email-remi.cardona@smartjog.com>
2012-10-03 0:37 ` [PATCH 4/7] [media] ds3000: bail out early on i2c failures during firmware load Antti Palosaari
[not found] ` <1348837172-11784-6-git-send-email-remi.cardona@smartjog.com>
2012-10-03 0:37 ` [PATCH 5/7] [media] ds3000: properly report firmware probing issues Antti Palosaari
[not found] ` <1348837172-11784-7-git-send-email-remi.cardona@smartjog.com>
2012-10-03 0:38 ` [PATCH 6/7] [media] ds3000: add module parameter to force firmware upload Antti Palosaari
2012-10-07 12:34 ` Mauro Carvalho Chehab
[not found] ` <1348837172-11784-8-git-send-email-remi.cardona@smartjog.com>
2012-10-03 0:41 ` Antti Palosaari [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=506B89D3.7030405@iki.fi \
--to=crope@iki.fi \
--cc=linux-media@vger.kernel.org \
--cc=liplianin@me.by \
--cc=remi.cardona@smartjog.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.