[PATCH] dvb: modified dvb_register_adapter() to avoid kmalloc/kfree

Modified dvb_register_adapter() to avoid kmalloc/kfree.  Drivers have to embed
struct dvb_adapter into their private data struct from now on.  (Andreas
Oberritter)

Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/media/video/video-buf-dvb.c b/drivers/media/video/video-buf-dvb.c
index 31cc4ed9b747..5f870075b55e 100644
--- a/drivers/media/video/video-buf-dvb.c
+++ b/drivers/media/video/video-buf-dvb.c
@@ -149,10 +149,10 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb,
                        dvb->name, result);
                 goto fail_adapter;
         }
-        dvb->adapter->priv = adapter_priv;
+        dvb->adapter.priv = adapter_priv;
 
         /* register frontend */
-        result = dvb_register_frontend(dvb->adapter, dvb->frontend);
+        result = dvb_register_frontend(&dvb->adapter, dvb->frontend);
         if (result < 0) {
                 printk(KERN_WARNING "%s: dvb_register_frontend failed (errno = %d)\n",
                        dvb->name, result);
@@ -178,7 +178,7 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb,
         dvb->dmxdev.filternum    = 256;
         dvb->dmxdev.demux        = &dvb->demux.dmx;
         dvb->dmxdev.capabilities = 0;
-        result = dvb_dmxdev_init(&dvb->dmxdev, dvb->adapter);
+        result = dvb_dmxdev_init(&dvb->dmxdev, &dvb->adapter);
         if (result < 0) {
                 printk(KERN_WARNING "%s: dvb_dmxdev_init failed (errno = %d)\n",
                        dvb->name, result);
@@ -209,7 +209,7 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb,
         }
 
         /* register network adapter */
-        dvb_net_init(dvb->adapter, &dvb->net, &dvb->demux.dmx);
+        dvb_net_init(&dvb->adapter, &dvb->net, &dvb->demux.dmx);
         return 0;
 
 fail_fe_conn:
@@ -223,7 +223,7 @@ fail_dmxdev:
 fail_dmx:
         dvb_unregister_frontend(dvb->frontend);
 fail_frontend:
-        dvb_unregister_adapter(dvb->adapter);
+        dvb_unregister_adapter(&dvb->adapter);
 fail_adapter:
         return result;
 }
@@ -236,7 +236,7 @@ void videobuf_dvb_unregister(struct videobuf_dvb *dvb)
         dvb_dmxdev_release(&dvb->dmxdev);
         dvb_dmx_release(&dvb->demux);
         dvb_unregister_frontend(dvb->frontend);
-        dvb_unregister_adapter(dvb->adapter);
+        dvb_unregister_adapter(&dvb->adapter);
 }
 
 EXPORT_SYMBOL(videobuf_dvb_register);