media: ddbridge: move CI detach code to ddbridge-ci.c

Move the CI teardown code to ddbridge-ci.c where everything else related
to CI hardware lives.

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>

diff --git a/drivers/media/pci/ddbridge/ddbridge-ci.c b/drivers/media/pci/ddbridge/ddbridge-ci.c
index 8dfbc3bbd86d2084e12b8f47003e33990565d4fb..5828111487b0b3a2f6d94c2b7a7b3b6c93e26251 100644 (file)
--- a/drivers/media/pci/ddbridge/ddbridge-ci.c
+++ b/drivers/media/pci/ddbridge/ddbridge-ci.c
@@ -346,3 +346,14 @@ int ddb_ci_attach(struct ddb_port *port, u32 bitrate)
        dvb_ca_en50221_init(port->dvb[0].adap, port->en, 0, 1);
        return 0;
 }
+
+void ddb_ci_detach(struct ddb_port *port)
+{
+       if (port->dvb[0].dev)
+               dvb_unregister_device(port->dvb[0].dev);
+       if (port->en) {
+               dvb_ca_en50221_release(port->en);
+               kfree(port->en->data);
+               port->en = NULL;
+       }
+}

diff --git a/drivers/media/pci/ddbridge/ddbridge-ci.h b/drivers/media/pci/ddbridge/ddbridge-ci.h
index 3a5d7ffab7b78e8c51747f02307b75c31fe09d23..35a39182dd835dfbf567f972acbf681c3ff1f669 100644 (file)
--- a/drivers/media/pci/ddbridge/ddbridge-ci.h
+++ b/drivers/media/pci/ddbridge/ddbridge-ci.h
@@ -26,5 +26,6 @@
 /******************************************************************************/
 
 int ddb_ci_attach(struct ddb_port *port, u32 bitrate);
+void ddb_ci_detach(struct ddb_port *port);
 
 #endif /* __DDBRIDGE_CI_H__ */

diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c
index 5188f400957ec40736d33d38a4422216ee1e30d3..c7d923e0e21ad64c5bb3423cadbd5e293177b8e9 100644 (file)
--- a/drivers/media/pci/ddbridge/ddbridge-core.c
+++ b/drivers/media/pci/ddbridge/ddbridge-core.c
@@ -2016,13 +2016,7 @@ void ddb_ports_detach(struct ddb *dev)
                        break;
                case DDB_PORT_CI:
                case DDB_PORT_LOOP:
-                       if (port->dvb[0].dev)
-                               dvb_unregister_device(port->dvb[0].dev);
-                       if (port->en) {
-                               dvb_ca_en50221_release(port->en);
-                               kfree(port->en->data);
-                               port->en = NULL;
-                       }
+                       ddb_ci_detach(port);
                        break;
                }
        }