Commit efd279ec authored by Jonathan Nieder's avatar Jonathan Nieder Committed by Mauro Carvalho Chehab

[media] flexcop: CodingStyle fix: don't use "if ((ret = foo()) < 0)"

Lift assignments from "if" conditionals for readability.  No change
in functionality intended.
Suggested-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: default avatarJonathan Nieder <jrnieder@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 722c90eb
...@@ -86,7 +86,8 @@ static int flexcop_dvb_init(struct flexcop_device *fc) ...@@ -86,7 +86,8 @@ static int flexcop_dvb_init(struct flexcop_device *fc)
fc->demux.stop_feed = flexcop_dvb_stop_feed; fc->demux.stop_feed = flexcop_dvb_stop_feed;
fc->demux.write_to_decoder = NULL; fc->demux.write_to_decoder = NULL;
if ((ret = dvb_dmx_init(&fc->demux)) < 0) { ret = dvb_dmx_init(&fc->demux);
if (ret < 0) {
err("dvb_dmx failed: error %d", ret); err("dvb_dmx failed: error %d", ret);
goto err_dmx; goto err_dmx;
} }
...@@ -96,23 +97,27 @@ static int flexcop_dvb_init(struct flexcop_device *fc) ...@@ -96,23 +97,27 @@ static int flexcop_dvb_init(struct flexcop_device *fc)
fc->dmxdev.filternum = fc->demux.feednum; fc->dmxdev.filternum = fc->demux.feednum;
fc->dmxdev.demux = &fc->demux.dmx; fc->dmxdev.demux = &fc->demux.dmx;
fc->dmxdev.capabilities = 0; fc->dmxdev.capabilities = 0;
if ((ret = dvb_dmxdev_init(&fc->dmxdev, &fc->dvb_adapter)) < 0) { ret = dvb_dmxdev_init(&fc->dmxdev, &fc->dvb_adapter);
if (ret < 0) {
err("dvb_dmxdev_init failed: error %d", ret); err("dvb_dmxdev_init failed: error %d", ret);
goto err_dmx_dev; goto err_dmx_dev;
} }
if ((ret = fc->demux.dmx.add_frontend(&fc->demux.dmx, &fc->hw_frontend)) < 0) { ret = fc->demux.dmx.add_frontend(&fc->demux.dmx, &fc->hw_frontend);
if (ret < 0) {
err("adding hw_frontend to dmx failed: error %d", ret); err("adding hw_frontend to dmx failed: error %d", ret);
goto err_dmx_add_hw_frontend; goto err_dmx_add_hw_frontend;
} }
fc->mem_frontend.source = DMX_MEMORY_FE; fc->mem_frontend.source = DMX_MEMORY_FE;
if ((ret = fc->demux.dmx.add_frontend(&fc->demux.dmx, &fc->mem_frontend)) < 0) { ret = fc->demux.dmx.add_frontend(&fc->demux.dmx, &fc->mem_frontend);
if (ret < 0) {
err("adding mem_frontend to dmx failed: error %d", ret); err("adding mem_frontend to dmx failed: error %d", ret);
goto err_dmx_add_mem_frontend; goto err_dmx_add_mem_frontend;
} }
if ((ret = fc->demux.dmx.connect_frontend(&fc->demux.dmx, &fc->hw_frontend)) < 0) { ret = fc->demux.dmx.connect_frontend(&fc->demux.dmx, &fc->hw_frontend);
if (ret < 0) {
err("connect frontend failed: error %d", ret); err("connect frontend failed: error %d", ret);
goto err_connect_frontend; goto err_connect_frontend;
} }
...@@ -260,7 +265,8 @@ int flexcop_device_initialize(struct flexcop_device *fc) ...@@ -260,7 +265,8 @@ int flexcop_device_initialize(struct flexcop_device *fc)
flexcop_hw_filter_init(fc); flexcop_hw_filter_init(fc);
flexcop_smc_ctrl(fc, 0); flexcop_smc_ctrl(fc, 0);
if ((ret = flexcop_dvb_init(fc))) ret = flexcop_dvb_init(fc);
if (ret)
goto error; goto error;
/* i2c has to be done before doing EEProm stuff - /* i2c has to be done before doing EEProm stuff -
...@@ -278,7 +284,8 @@ int flexcop_device_initialize(struct flexcop_device *fc) ...@@ -278,7 +284,8 @@ int flexcop_device_initialize(struct flexcop_device *fc)
} else } else
warn("reading of MAC address failed.\n"); warn("reading of MAC address failed.\n");
if ((ret = flexcop_frontend_init(fc))) ret = flexcop_frontend_init(fc);
if (ret)
goto error; goto error;
flexcop_device_name(fc,"initialization of","complete"); flexcop_device_name(fc,"initialization of","complete");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment