[PATCH 3/3] [media] dvb-ttusb-budget: Adjust eight checks for null pointers

[SF Markus Elfring]

From: Markus Elfring 
Date: Wed, 20 Sep 2017 20:53:13 +0200
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The script “checkpatch.pl” pointed information out like the following.

Comparison to NULL could be written …

Thus fix the affected source code places.

Signed-off-by: Markus Elfring 
---
 drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c 
b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
index fef3c8554e91..2e97b1e64249 100644
--- a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
@@ -1572,7 +1572,7 @@ static void frontend_init(struct ttusb* ttusb)
case 0x1003: // Hauppauge/TT Nova-USB-S budget (stv0299/ALPS 
BSRU6|BSBE1(tsa5059))
// try the stv0299 based first
ttusb->fe = dvb_attach(stv0299_attach, _stv0299_config, 
>i2c_adap);
-   if (ttusb->fe != NULL) {
+   if (ttusb->fe) {
ttusb->fe->ops.tuner_ops.set_params = 
philips_tsa5059_tuner_set_params;
 
if(ttusb->revision == TTUSB_REV_2_2) { // ALPS BSBE1
@@ -1586,7 +1586,7 @@ static void frontend_init(struct ttusb* ttusb)
 
// Grundig 29504-491
ttusb->fe = dvb_attach(tda8083_attach, 
_novas_grundig_29504_491_config, >i2c_adap);
-   if (ttusb->fe != NULL) {
+   if (ttusb->fe) {
ttusb->fe->ops.tuner_ops.set_params = 
ttusb_novas_grundig_29504_491_tuner_set_params;
ttusb->fe->ops.set_voltage = ttusb_set_voltage;
break;
@@ -1595,13 +1595,13 @@ static void frontend_init(struct ttusb* ttusb)
 
case 0x1004: // Hauppauge/TT DVB-C budget (ves1820/ALPS TDBE2(sp5659))
ttusb->fe = dvb_attach(ves1820_attach, _tdbe2_config, 
>i2c_adap, read_pwm(ttusb));
-   if (ttusb->fe != NULL) {
+   if (ttusb->fe) {
ttusb->fe->ops.tuner_ops.set_params = 
alps_tdbe2_tuner_set_params;
break;
}
 
ttusb->fe = dvb_attach(stv0297_attach, 
_philips_tdm1316l_config, >i2c_adap);
-   if (ttusb->fe != NULL) {
+   if (ttusb->fe) {
ttusb->fe->ops.tuner_ops.set_params = 
dvbc_philips_tdm1316l_tuner_set_params;
break;
}
@@ -1610,14 +1610,14 @@ static void frontend_init(struct ttusb* ttusb)
case 0x1005: // Hauppauge/TT Nova-USB-t budget (tda10046/Philips 
td1316(tda6651tt) OR cx22700/ALPS TDMB7(??))
// try the ALPS TDMB7 first
ttusb->fe = dvb_attach(cx22700_attach, _tdmb7_config, 
>i2c_adap);
-   if (ttusb->fe != NULL) {
+   if (ttusb->fe) {
ttusb->fe->ops.tuner_ops.set_params = 
alps_tdmb7_tuner_set_params;
break;
}
 
// Philips td1316
ttusb->fe = dvb_attach(tda10046_attach, 
_tdm1316l_config, >i2c_adap);
-   if (ttusb->fe != NULL) {
+   if (ttusb->fe) {
ttusb->fe->ops.tuner_ops.init = 
philips_tdm1316l_tuner_init;
ttusb->fe->ops.tuner_ops.set_params = 
philips_tdm1316l_tuner_set_params;
break;
@@ -1625,7 +1625,7 @@ static void frontend_init(struct ttusb* ttusb)
break;
}
 
-   if (ttusb->fe == NULL) {
+   if (!ttusb->fe) {
printk("dvb-ttusb-budget: A frontend driver was not found for 
device [%04x:%04x]\n",
   le16_to_cpu(ttusb->dev->descriptor.idVendor),
   le16_to_cpu(ttusb->dev->descriptor.idProduct));
@@ -1781,7 +1781,7 @@ static void ttusb_disconnect(struct usb_interface *intf)
dvb_net_release(>dvbnet);
dvb_dmxdev_release(>dmxdev);
dvb_dmx_release(>dvb_demux);
-   if (ttusb->fe != NULL) {
+   if (ttusb->fe) {
dvb_unregister_frontend(ttusb->fe);
dvb_frontend_detach(ttusb->fe);
}
-- 
2.14.1

[PATCH 3/3] [media] dvb-ttusb-budget: Adjust eight checks for null pointers

[SF Markus Elfring]

From: Markus Elfring 
Date: Wed, 20 Sep 2017 20:53:13 +0200
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The script “checkpatch.pl” pointed information out like the following.

Comparison to NULL could be written …

Thus fix the affected source code places.

Signed-off-by: Markus Elfring 
---
 drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c 
b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
index fef3c8554e91..2e97b1e64249 100644
--- a/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c
@@ -1572,7 +1572,7 @@ static void frontend_init(struct ttusb* ttusb)
case 0x1003: // Hauppauge/TT Nova-USB-S budget (stv0299/ALPS 
BSRU6|BSBE1(tsa5059))
// try the stv0299 based first
ttusb->fe = dvb_attach(stv0299_attach, _stv0299_config, 
>i2c_adap);
-   if (ttusb->fe != NULL) {
+   if (ttusb->fe) {
ttusb->fe->ops.tuner_ops.set_params = 
philips_tsa5059_tuner_set_params;
 
if(ttusb->revision == TTUSB_REV_2_2) { // ALPS BSBE1
@@ -1586,7 +1586,7 @@ static void frontend_init(struct ttusb* ttusb)
 
// Grundig 29504-491
ttusb->fe = dvb_attach(tda8083_attach, 
_novas_grundig_29504_491_config, >i2c_adap);
-   if (ttusb->fe != NULL) {
+   if (ttusb->fe) {
ttusb->fe->ops.tuner_ops.set_params = 
ttusb_novas_grundig_29504_491_tuner_set_params;
ttusb->fe->ops.set_voltage = ttusb_set_voltage;
break;
@@ -1595,13 +1595,13 @@ static void frontend_init(struct ttusb* ttusb)
 
case 0x1004: // Hauppauge/TT DVB-C budget (ves1820/ALPS TDBE2(sp5659))
ttusb->fe = dvb_attach(ves1820_attach, _tdbe2_config, 
>i2c_adap, read_pwm(ttusb));
-   if (ttusb->fe != NULL) {
+   if (ttusb->fe) {
ttusb->fe->ops.tuner_ops.set_params = 
alps_tdbe2_tuner_set_params;
break;
}
 
ttusb->fe = dvb_attach(stv0297_attach, 
_philips_tdm1316l_config, >i2c_adap);
-   if (ttusb->fe != NULL) {
+   if (ttusb->fe) {
ttusb->fe->ops.tuner_ops.set_params = 
dvbc_philips_tdm1316l_tuner_set_params;
break;
}
@@ -1610,14 +1610,14 @@ static void frontend_init(struct ttusb* ttusb)
case 0x1005: // Hauppauge/TT Nova-USB-t budget (tda10046/Philips 
td1316(tda6651tt) OR cx22700/ALPS TDMB7(??))
// try the ALPS TDMB7 first
ttusb->fe = dvb_attach(cx22700_attach, _tdmb7_config, 
>i2c_adap);
-   if (ttusb->fe != NULL) {
+   if (ttusb->fe) {
ttusb->fe->ops.tuner_ops.set_params = 
alps_tdmb7_tuner_set_params;
break;
}
 
// Philips td1316
ttusb->fe = dvb_attach(tda10046_attach, 
_tdm1316l_config, >i2c_adap);
-   if (ttusb->fe != NULL) {
+   if (ttusb->fe) {
ttusb->fe->ops.tuner_ops.init = 
philips_tdm1316l_tuner_init;
ttusb->fe->ops.tuner_ops.set_params = 
philips_tdm1316l_tuner_set_params;
break;
@@ -1625,7 +1625,7 @@ static void frontend_init(struct ttusb* ttusb)
break;
}
 
-   if (ttusb->fe == NULL) {
+   if (!ttusb->fe) {
printk("dvb-ttusb-budget: A frontend driver was not found for 
device [%04x:%04x]\n",
   le16_to_cpu(ttusb->dev->descriptor.idVendor),
   le16_to_cpu(ttusb->dev->descriptor.idProduct));
@@ -1781,7 +1781,7 @@ static void ttusb_disconnect(struct usb_interface *intf)
dvb_net_release(>dvbnet);
dvb_dmxdev_release(>dmxdev);
dvb_dmx_release(>dvb_demux);
-   if (ttusb->fe != NULL) {
+   if (ttusb->fe) {
dvb_unregister_frontend(ttusb->fe);
dvb_frontend_detach(ttusb->fe);
}
-- 
2.14.1