openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: ddbridge/ci: further deduplicate code/logic in ddb_ci_attach() 

Deduplicate the checks for a valid ptr in port->en, and also handle the
default case to also catch eventually yet unsupported CI hardware.

Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Daniel Scheller 2018-02-08 14:53:12 -05:00 committed by Mauro Carvalho Chehab
parent e2ce49468a
commit 9403f089bf
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/pci/ddbridge/ddbridge-ci.c
View File

@ -325,24 +325,20 @@ int ddb_ci_attach(struct ddb_port *port, u32 bitrate)
case DDB_CI_EXTERNAL_SONY: case DDB_CI_EXTERNAL_SONY:
cxd_cfg.bitrate = bitrate; cxd_cfg.bitrate = bitrate;
port->en = cxd2099_attach(&cxd_cfg, port, &port->i2c->adap); port->en = cxd2099_attach(&cxd_cfg, port, &port->i2c->adap);
if (!port->en)
return -ENODEV;
break; break;
case DDB_CI_EXTERNAL_XO2: case DDB_CI_EXTERNAL_XO2:
case DDB_CI_EXTERNAL_XO2_B: case DDB_CI_EXTERNAL_XO2_B:
ci_xo2_attach(port); ci_xo2_attach(port);
if (!port->en)
return -ENODEV;
break; break;
case DDB_CI_INTERNAL: case DDB_CI_INTERNAL:
ci_attach(port); ci_attach(port);
if (!port->en)
return -ENODEV;
break; break;
default:
return -ENODEV;
} }
if (!port->en)
return -ENODEV;
dvb_ca_en50221_init(port->dvb[0].adap, port->en, 0, 1); dvb_ca_en50221_init(port->dvb[0].adap, port->en, 0, 1);
return 0; return 0;
} }