Jelajahi Sumber

media: ddbridge: deduplicate calls to dvb_ca_en50221_init()

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>
Daniel Scheller 7 tahun lalu
induk
melakukan
b5472c12fa
1 mengubah file dengan 2 tambahan dan 4 penghapusan
  1. 2 4
      drivers/media/pci/ddbridge/ddbridge-ci.c

+ 2 - 4
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);
 		port->en = cxd2099_attach(&cxd_cfg, port, &port->i2c->adap);
 		if (!port->en)
 		if (!port->en)
 			return -ENODEV;
 			return -ENODEV;
-		dvb_ca_en50221_init(port->dvb[0].adap,
-				    port->en, 0, 1);
 		break;
 		break;
 
 
 	case DDB_CI_EXTERNAL_XO2:
 	case DDB_CI_EXTERNAL_XO2:
@@ -336,15 +334,15 @@ int ddb_ci_attach(struct ddb_port *port, u32 bitrate)
 		ci_xo2_attach(port);
 		ci_xo2_attach(port);
 		if (!port->en)
 		if (!port->en)
 			return -ENODEV;
 			return -ENODEV;
-		dvb_ca_en50221_init(port->dvb[0].adap, port->en, 0, 1);
 		break;
 		break;
 
 
 	case DDB_CI_INTERNAL:
 	case DDB_CI_INTERNAL:
 		ci_attach(port);
 		ci_attach(port);
 		if (!port->en)
 		if (!port->en)
 			return -ENODEV;
 			return -ENODEV;
-		dvb_ca_en50221_init(port->dvb[0].adap, port->en, 0, 1);
 		break;
 		break;
 	}
 	}
+
+	dvb_ca_en50221_init(port->dvb[0].adap, port->en, 0, 1);
 	return 0;
 	return 0;
 }
 }