From: Daniel Scheller <d.scheller@xxxxxxx> All CI types do dvb_ca_en50221_init() with the same arguments. Move this call after the switch-case to remove the repetition in every case block. Cc: Ralph Metzler <rjkm@xxxxxxxxxxxxxx> Signed-off-by: Daniel Scheller <d.scheller@xxxxxxx> --- drivers/media/pci/ddbridge/ddbridge-ci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/pci/ddbridge/ddbridge-ci.c b/drivers/media/pci/ddbridge/ddbridge-ci.c index a4fd747763a0..8dfbc3bbd86d 100644 --- a/drivers/media/pci/ddbridge/ddbridge-ci.c +++ b/drivers/media/pci/ddbridge/ddbridge-ci.c @@ -327,8 +327,6 @@ int ddb_ci_attach(struct ddb_port *port, u32 bitrate) port->en = cxd2099_attach(&cxd_cfg, port, &port->i2c->adap); if (!port->en) return -ENODEV; - dvb_ca_en50221_init(port->dvb[0].adap, - port->en, 0, 1); break; case DDB_CI_EXTERNAL_XO2: @@ -336,15 +334,15 @@ int ddb_ci_attach(struct ddb_port *port, u32 bitrate) ci_xo2_attach(port); if (!port->en) return -ENODEV; - dvb_ca_en50221_init(port->dvb[0].adap, port->en, 0, 1); break; case DDB_CI_INTERNAL: ci_attach(port); if (!port->en) return -ENODEV; - dvb_ca_en50221_init(port->dvb[0].adap, port->en, 0, 1); break; } + + dvb_ca_en50221_init(port->dvb[0].adap, port->en, 0, 1); return 0; } -- 2.13.6
