media: si470x: consolidate multiple printk's

When the version warning is given, multiple dev_warn() are
called. Consolidate the ones that could be merged altogether.

Suggested-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/radio/si470x/radio-si470x-i2c.c b/drivers/media/radio/si470x/radio-si470x-i2c.c
index 7ea7c6326f53c65b3f4f63d54d5c8c262e2fce02..bdb13c974b0217d503b4018ab7a6f028aa13f28b 100644 (file)
--- a/drivers/media/radio/si470x/radio-si470x-i2c.c
+++ b/drivers/media/radio/si470x/radio-si470x-i2c.c
@@ -334,7 +334,6 @@ static int si470x_i2c_probe(struct i2c_client *client)
 {
        struct si470x_device *radio;
        int retval = 0;
-       unsigned char version_warning = 0;
 
        /* private data allocation and initialization */
        radio = devm_kzalloc(&client->dev, sizeof(*radio), GFP_KERNEL);
@@ -410,20 +409,10 @@ static int si470x_i2c_probe(struct i2c_client *client)
                        radio->registers[DEVICEID], radio->registers[SI_CHIPID]);
        if ((radio->registers[SI_CHIPID] & SI_CHIPID_FIRMWARE) < RADIO_FW_VERSION) {
                dev_warn(&client->dev,
-                       "This driver is known to work with firmware version %u,\n",
-                       RADIO_FW_VERSION);
-               dev_warn(&client->dev,
-                       "but the device has firmware version %u.\n",
+                       "This driver is known to work with firmware version %u, but the device has firmware version %u.\n"
+                       "If you have some trouble using this driver, please report to V4L ML at linux-media@vger.kernel.org\n",
+                       RADIO_FW_VERSION,
                        radio->registers[SI_CHIPID] & SI_CHIPID_FIRMWARE);
-               version_warning = 1;
-       }
-
-       /* give out version warning */
-       if (version_warning == 1) {
-               dev_warn(&client->dev,
-                       "If you have some trouble using this driver,\n");
-               dev_warn(&client->dev,
-                       "please report to V4L ML at linux-media@vger.kernel.org\n");
        }
 
        /* set initial frequency */

diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c
index 1e70e6971fe4c05495ce3100d6bf36799b837e3b..6b2768623c8830cee4005533d8031fce0cc97cda 100644 (file)
--- a/drivers/media/radio/si470x/radio-si470x-usb.c
+++ b/drivers/media/radio/si470x/radio-si470x-usb.c
@@ -681,10 +681,8 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
                        radio->registers[DEVICEID], radio->registers[SI_CHIPID]);
        if ((radio->registers[SI_CHIPID] & SI_CHIPID_FIRMWARE) < RADIO_FW_VERSION) {
                dev_warn(&intf->dev,
-                       "This driver is known to work with firmware version %u,\n",
-                       RADIO_FW_VERSION);
-               dev_warn(&intf->dev,
-                       "but the device has firmware version %u.\n",
+                       "This driver is known to work with firmware version %u, but the device has firmware version %u.\n",
+                       RADIO_FW_VERSION,
                        radio->registers[SI_CHIPID] & SI_CHIPID_FIRMWARE);
                version_warning = 1;
        }
@@ -698,10 +696,8 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
                        radio->software_version, radio->hardware_version);
        if (radio->hardware_version < RADIO_HW_VERSION) {
                dev_warn(&intf->dev,
-                       "This driver is known to work with hardware version %u,\n",
-                       RADIO_HW_VERSION);
-               dev_warn(&intf->dev,
-                       "but the device has hardware version %u.\n",
+                       "This driver is known to work with hardware version %u, but the device has hardware version %u.\n",
+                       RADIO_HW_VERSION,
                        radio->hardware_version);
                version_warning = 1;
        }
@@ -709,9 +705,7 @@ static int si470x_usb_driver_probe(struct usb_interface *intf,
        /* give out version warning */
        if (version_warning == 1) {
                dev_warn(&intf->dev,
-                       "If you have some trouble using this driver,\n");
-               dev_warn(&intf->dev,
-                       "please report to V4L ML at linux-media@vger.kernel.org\n");
+                       "If you have some trouble using this driver, please report to V4L ML at linux-media@vger.kernel.org\n");
        }
 
        /* set led to connect state */