V4L/DVB (11300): cx88: convert to v4l2_subdev.

Convert cx88 to use v4l2_subdev since the old i2c autoprobing mechanism
will be removed.

Added code to explicitly load tvaudio where needed. Also fix the rtc-isl1208
support: since that driver no longer supports autoprobing it has to be
loaded using the new i2c API.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index 17c7dad4261..f2fb9f30bfc 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -991,7 +991,7 @@ int cx88_set_tvnorm(struct cx88_core *core, v4l2_std_id norm)
         set_tvaudio(core);
 
         // tell i2c chips
-        cx88_call_i2c_clients(core,VIDIOC_S_STD,&norm);
+        call_all(core, tuner, s_std, norm);
 
         // done
         return 0;
@@ -1059,8 +1059,11 @@ void cx88_core_put(struct cx88_core *core, struct pci_dev *pci)
 
         mutex_lock(&devlist);
         cx88_ir_fini(core);
-        if (0 == core->i2c_rc)
+        if (0 == core->i2c_rc) {
+                if (core->i2c_rtc)
+                        i2c_unregister_device(core->i2c_rtc);
                 i2c_del_adapter(&core->i2c_adap);
+        }
         list_del(&core->devlist);
         iounmap(core->lmmio);
         cx88_devcount--;