media: ddbridge: deduplicate calls to dvb_ca_en50221_init() (b5472c12) · Commits · 戴 / test

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@metzlerbros.de> Signed-off-by:

Daniel Scheller <d.scheller@gmx.net> Signed-off-by:

Mauro Carvalho Chehab <mchehab@s-opensource.com>

drivers/media/pci/ddbridge/ddbridge-ci.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message