diff options
Diffstat (limited to 'linux')
41 files changed, 22 insertions, 425 deletions
diff --git a/linux/drivers/media/dvb/b2c2/skystar2.c b/linux/drivers/media/dvb/b2c2/skystar2.c index 2a919f245..30e9e07c5 100644 --- a/linux/drivers/media/dvb/b2c2/skystar2.c +++ b/linux/drivers/media/dvb/b2c2/skystar2.c @@ -51,7 +51,6 @@ #include "demux.h" #include "dvb_net.h" -#include "dvb_functions.h" static int debug; static int enable_hw_filters = 2; diff --git a/linux/drivers/media/dvb/bt8xx/bt878.c b/linux/drivers/media/dvb/bt8xx/bt878.c index 66ffd5379..cdfc83810 100644 --- a/linux/drivers/media/dvb/bt8xx/bt878.c +++ b/linux/drivers/media/dvb/bt8xx/bt878.c @@ -46,7 +46,6 @@ #include "bt878.h" #include "dst-bt878.h" -#include "dvb_functions.h" /**************************************/ /* Miscellaneous utility definitions */ diff --git a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c index 7a28e7085..94925f90c 100644 --- a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c @@ -35,8 +35,6 @@ #include "dvb-bt8xx.h" -#include "dvb_functions.h" - #include "bt878.h" static int debug; diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.c b/linux/drivers/media/dvb/dvb-core/dmxdev.c index 1956bc207..d0965cdff 100644 --- a/linux/drivers/media/dvb/dvb-core/dmxdev.c +++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c @@ -34,7 +34,6 @@ #include <asm/system.h> #include "dmxdev.h" -#include "dvb_functions.h" static int debug; diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c index 448c0e304..c4d88d4ba 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c @@ -39,7 +39,6 @@ #include <asm/atomic.h> #include "dvb_ca_en50221.h" -#include "dvb_functions.h" #include "dvb_ringbuffer.h" static int dvb_ca_en50221_debug; diff --git a/linux/drivers/media/dvb/dvb-core/dvb_demux.c b/linux/drivers/media/dvb/dvb-core/dvb_demux.c index 93060eb51..8b79bee75 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_demux.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_demux.c @@ -31,7 +31,6 @@ #include <asm/uaccess.h> #include "dvb_demux.h" -#include "dvb_functions.h" #define NOBUFS /* diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c index df58e8725..b92043f34 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c @@ -39,7 +39,6 @@ #include "dvb_frontend.h" #include "dvbdev.h" -#include "dvb_functions.h" static int dvb_frontend_debug; static int dvb_shutdown_timeout = 5; @@ -1092,7 +1091,7 @@ static struct file_operations dvb_frontend_fops = { }; int -dvb_register_frontend_new (int (*ioctl) (struct dvb_frontend *frontend, +dvb_register_frontend (int (*ioctl) (struct dvb_frontend *frontend, unsigned int cmd, void *arg), struct dvb_adapter *dvb_adapter, void *data, diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h index 6d44705c1..439dbd5f7 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.h +++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.h @@ -97,7 +97,7 @@ struct dvb_frontend_tune_settings { #define FE_UNREGISTER _IO ('v', 85) extern int -dvb_register_frontend_new (int (*ioctl) (struct dvb_frontend *frontend, +dvb_register_frontend (int (*ioctl) (struct dvb_frontend *frontend, unsigned int cmd, void *arg), struct dvb_adapter *dvb_adapter, void *data, diff --git a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c b/linux/drivers/media/dvb/dvb-core/dvb_i2c.c deleted file mode 100644 index 8bc8b5e7b..000000000 --- a/linux/drivers/media/dvb/dvb-core/dvb_i2c.c +++ /dev/null @@ -1,290 +0,0 @@ -/* - * dvb_i2c.h: simplified i2c interface for DVB adapters to get rid of i2c-core.c - * - * Copyright (C) 2002 Holger Waechtler for convergence integrated media GmbH - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * Or, point your browser to http://www.gnu.org/copyleft/gpl.html - */ - -#include <linux/errno.h> -#include <linux/slab.h> -#include <linux/list.h> -#include <linux/module.h> -#include <asm/semaphore.h> - -#include "dvb_i2c.h" -#include "dvb_functions.h" - - -struct dvb_i2c_device { - struct list_head list_head; - struct module *owner; - int (*attach) (struct dvb_i2c_bus *i2c, void **data); - void (*detach) (struct dvb_i2c_bus *i2c, void *data); - void *data; -}; - -LIST_HEAD(dvb_i2c_buslist); -LIST_HEAD(dvb_i2c_devicelist); - -DECLARE_MUTEX(dvb_i2c_mutex); - -static int register_i2c_client (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev) -{ - struct dvb_i2c_device *client; - - if (!(client = kmalloc (sizeof (struct dvb_i2c_device), GFP_KERNEL))) - return -ENOMEM; - - client->detach = dev->detach; - client->owner = dev->owner; - client->data = dev->data; - - INIT_LIST_HEAD(&client->list_head); - - list_add_tail (&client->list_head, &i2c->client_list); - - return 0; -} - - -static void try_attach_device (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev) -{ - if (dev->owner) { - if (!try_module_get(dev->owner)) - return; - } - - if (dev->attach (i2c, &dev->data) == 0) { - register_i2c_client (i2c, dev); - } else { - if (dev->owner) - module_put (dev->owner); - } -} - - -static void detach_device (struct dvb_i2c_bus *i2c, struct dvb_i2c_device *dev) -{ - dev->detach (i2c, dev->data); - - if (dev->owner) - module_put (dev->owner); -} - - -static void unregister_i2c_client_from_bus (struct dvb_i2c_device *dev, - struct dvb_i2c_bus *i2c) -{ - struct list_head *entry, *n; - - list_for_each_safe (entry, n, &i2c->client_list) { - struct dvb_i2c_device *client; - - client = list_entry (entry, struct dvb_i2c_device, list_head); - - if (client->detach == dev->detach) { - list_del (entry); - detach_device (i2c, dev); - } - } -} - - -static void unregister_i2c_client_from_all_busses (struct dvb_i2c_device *dev) -{ - struct list_head *entry, *n; - - list_for_each_safe (entry, n, &dvb_i2c_buslist) { - struct dvb_i2c_bus *i2c; - - i2c = list_entry (entry, struct dvb_i2c_bus, list_head); - - unregister_i2c_client_from_bus (dev, i2c); - } -} - - -static void unregister_all_clients_from_bus (struct dvb_i2c_bus *i2c) -{ - struct list_head *entry, *n; - - list_for_each_safe (entry, n, &(i2c->client_list)) { - struct dvb_i2c_device *dev; - - dev = list_entry (entry, struct dvb_i2c_device, list_head); - - unregister_i2c_client_from_bus (dev, i2c); - } -} - - -static void probe_device_on_all_busses (struct dvb_i2c_device *dev) -{ - struct list_head *entry; - - list_for_each (entry, &dvb_i2c_buslist) { - struct dvb_i2c_bus *i2c; - - i2c = list_entry (entry, struct dvb_i2c_bus, list_head); - - try_attach_device (i2c, dev); - } -} - - -static void probe_devices_on_bus (struct dvb_i2c_bus *i2c) -{ - struct list_head *entry; - - list_for_each (entry, &dvb_i2c_devicelist) { - struct dvb_i2c_device *dev; - - dev = list_entry (entry, struct dvb_i2c_device, list_head); - - try_attach_device (i2c, dev); - } -} - - -static struct dvb_i2c_bus* dvb_find_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c, - const struct i2c_msg msgs[], - int num), - struct dvb_adapter *adapter, - int id) -{ - struct list_head *entry; - - list_for_each (entry, &dvb_i2c_buslist) { - struct dvb_i2c_bus *i2c; - - i2c = list_entry (entry, struct dvb_i2c_bus, list_head); - - if (i2c->xfer == xfer && i2c->adapter == adapter && i2c->id == id) - return i2c; - } - - return NULL; -} - - -struct dvb_i2c_bus* -dvb_register_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c, - const struct i2c_msg *msgs, int num), - void *data, struct dvb_adapter *adapter, int id) -{ - struct dvb_i2c_bus *i2c; - - if (down_interruptible (&dvb_i2c_mutex)) - return NULL; - - if (!(i2c = kmalloc (sizeof (struct dvb_i2c_bus), GFP_KERNEL))) { - up (&dvb_i2c_mutex); - return NULL; - } - - INIT_LIST_HEAD(&i2c->list_head); - INIT_LIST_HEAD(&i2c->client_list); - - i2c->xfer = xfer; - i2c->data = data; - i2c->adapter = adapter; - i2c->id = id; - - probe_devices_on_bus (i2c); - - list_add_tail (&i2c->list_head, &dvb_i2c_buslist); - - up (&dvb_i2c_mutex); - - return i2c; -} - - -void dvb_unregister_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c, - const struct i2c_msg msgs[], int num), - struct dvb_adapter *adapter, int id) -{ - struct dvb_i2c_bus *i2c; - - down (&dvb_i2c_mutex); - - if ((i2c = dvb_find_i2c_bus (xfer, adapter, id))) { - unregister_all_clients_from_bus (i2c); - list_del (&i2c->list_head); - kfree (i2c); - } - - up (&dvb_i2c_mutex); -} - - -int dvb_register_i2c_device (struct module *owner, - int (*attach) (struct dvb_i2c_bus *i2c, void **data), - void (*detach) (struct dvb_i2c_bus *i2c, void *data)) -{ - struct dvb_i2c_device *entry; - - if (down_interruptible (&dvb_i2c_mutex)) - return -ERESTARTSYS; - - if (!(entry = kmalloc (sizeof (struct dvb_i2c_device), GFP_KERNEL))) { - up(&dvb_i2c_mutex); - return -ENOMEM; - } - - entry->owner = owner; - entry->attach = attach; - entry->detach = detach; - - INIT_LIST_HEAD(&entry->list_head); - - probe_device_on_all_busses (entry); - - list_add_tail (&entry->list_head, &dvb_i2c_devicelist); - - up (&dvb_i2c_mutex); - - return 0; -} - - -int dvb_unregister_i2c_device (int (*attach) (struct dvb_i2c_bus *i2c, void **data)) -{ - struct list_head *entry, *n; - - down (&dvb_i2c_mutex); - - list_for_each_safe (entry, n, &dvb_i2c_devicelist) { - struct dvb_i2c_device *dev; - - dev = list_entry (entry, struct dvb_i2c_device, list_head); - - if (dev->attach == attach) { - list_del (entry); - unregister_i2c_client_from_all_busses (dev); - kfree (entry); - up (&dvb_i2c_mutex); - return 0; - } - } - - up (&dvb_i2c_mutex); - - return -EINVAL; -} - - diff --git a/linux/drivers/media/dvb/dvb-core/dvb_i2c.h b/linux/drivers/media/dvb/dvb-core/dvb_i2c.h deleted file mode 100644 index 5b37c132a..000000000 --- a/linux/drivers/media/dvb/dvb-core/dvb_i2c.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - * dvb_i2c.h: i2c interface to get rid of i2c-core.c - * - * Copyright (C) 2002 Holger Waechtler for convergence integrated media GmbH - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef _DVB_I2C_H_ -#define _DVB_I2C_H_ - -#include <linux/list.h> -#include <linux/i2c.h> - -#include "dvbdev.h" - -//FIXME: Move to i2c-id.h -#define I2C_DRIVERID_DVBFE_ALPS_TDLB7 I2C_DRIVERID_EXP2 -#define I2C_DRIVERID_DVBFE_ALPS_TDMB7 I2C_DRIVERID_EXP2 -#define I2C_DRIVERID_DVBFE_AT76C651 I2C_DRIVERID_EXP2 -#define I2C_DRIVERID_DVBFE_CX24110 I2C_DRIVERID_EXP2 -#define I2C_DRIVERID_DVBFE_DST I2C_DRIVERID_EXP2 -#define I2C_DRIVERID_DVBFE_DUMMY I2C_DRIVERID_EXP2 -#define I2C_DRIVERID_DVBFE_L64781 I2C_DRIVERID_EXP2 -#define I2C_DRIVERID_DVBFE_MT312 I2C_DRIVERID_EXP2 -#define I2C_DRIVERID_DVBFE_MT352 I2C_DRIVERID_EXP2 -#define I2C_DRIVERID_DVBFE_NXT6000 I2C_DRIVERID_EXP2 -#define I2C_DRIVERID_DVBFE_SP887X I2C_DRIVERID_EXP2 -#define I2C_DRIVERID_DVBFE_STV0299 I2C_DRIVERID_EXP2 -#define I2C_DRIVERID_DVBFE_TDA1004X I2C_DRIVERID_EXP2 -#define I2C_DRIVERID_DVBFE_TDA8083 I2C_DRIVERID_EXP2 -#define I2C_DRIVERID_DVBFE_VES1820 I2C_DRIVERID_EXP2 -#define I2C_DRIVERID_DVBFE_VES1X93 I2C_DRIVERID_EXP2 - -struct dvb_i2c_bus { - struct list_head list_head; - int (*xfer) (struct dvb_i2c_bus *i2c, - const struct i2c_msg msgs[], - int num); - void *data; - struct dvb_adapter *adapter; - int id; - struct list_head client_list; -}; - - -extern struct dvb_i2c_bus* -dvb_register_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c, - const struct i2c_msg *msgs, int num), - void *data, - struct dvb_adapter *adapter, - int id); - -extern -void dvb_unregister_i2c_bus (int (*xfer) (struct dvb_i2c_bus *i2c, - const struct i2c_msg msgs[], int num), - struct dvb_adapter *adapter, - int id); - - -extern int dvb_register_i2c_device (struct module *owner, - int (*attach) (struct dvb_i2c_bus *i2c, void **data), - void (*detach) (struct dvb_i2c_bus *i2c, void *data)); - -extern int dvb_unregister_i2c_device (int (*attach) (struct dvb_i2c_bus *i2c, void **data)); - -#endif - diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c b/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c index 57e9ead04..0cf48c77b 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c @@ -23,7 +23,7 @@ EXPORT_SYMBOL(dvb_dmx_swfilter_204); EXPORT_SYMBOL(dvbdmx_connect_frontend); EXPORT_SYMBOL(dvbdmx_disconnect_frontend); -EXPORT_SYMBOL(dvb_register_frontend_new); +EXPORT_SYMBOL(dvb_register_frontend); EXPORT_SYMBOL(dvb_unregister_frontend_new); EXPORT_SYMBOL(dvb_add_frontend_ioctls); EXPORT_SYMBOL(dvb_remove_frontend_ioctls); diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c index 780a02fb6..29bcb929f 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_net.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c @@ -40,7 +40,6 @@ #include "dvb_demux.h" #include "dvb_net.h" -#include "dvb_functions.h" static inline __u32 iov_crc32( __u32 c, struct iovec *iov, unsigned int cnt ) diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c index c62bffea9..e7a6ecdab 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.c +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c @@ -33,7 +33,6 @@ #include <linux/device.h> #include "dvbdev.h" -#include "dvb_functions.h" static int dvbdev_debug; diff --git a/linux/drivers/media/dvb/frontends/alps_tdlb7.c b/linux/drivers/media/dvb/frontends/alps_tdlb7.c index b605332fe..3645b9edf 100644 --- a/linux/drivers/media/dvb/frontends/alps_tdlb7.c +++ b/linux/drivers/media/dvb/frontends/alps_tdlb7.c @@ -39,7 +39,6 @@ #include <linux/delay.h> #include "dvb_frontend.h" -#include "dvb_functions.h" #define FRONTEND_NAME "dvbfe_alps_tdlb7" @@ -667,7 +666,7 @@ static int attach_adapter(struct i2c_adapter *adapter) goto out; } - ret = dvb_register_frontend_new(tdlb7_ioctl, state->dvb, state, + ret = dvb_register_frontend(tdlb7_ioctl, state->dvb, state, &tdlb7_info, THIS_MODULE); if (ret) { printk("tdlb7: registering frontend to dvb-core failed.\n"); diff --git a/linux/drivers/media/dvb/frontends/alps_tdmb7.c b/linux/drivers/media/dvb/frontends/alps_tdmb7.c index ea2e73ca1..4802964f9 100644 --- a/linux/drivers/media/dvb/frontends/alps_tdmb7.c +++ b/linux/drivers/media/dvb/frontends/alps_tdmb7.c @@ -28,7 +28,6 @@ #include <linux/slab.h> #include "dvb_frontend.h" -#include "dvb_functions.h" #define FRONTEND_NAME "dvbfe_alps_tdmb7" @@ -450,7 +449,7 @@ static int attach_adapter (struct i2c_adapter *adapter) BUG_ON(!state->dvb); - ret = dvb_register_frontend_new (tdmb7_ioctl, state->dvb, state, + ret = dvb_register_frontend (tdmb7_ioctl, state->dvb, state, &tdmb7_info, THIS_MODULE); if (ret) { i2c_detach_client(client); diff --git a/linux/drivers/media/dvb/frontends/at76c651.c b/linux/drivers/media/dvb/frontends/at76c651.c index 5ceccb13a..32556dc52 100644 --- a/linux/drivers/media/dvb/frontends/at76c651.c +++ b/linux/drivers/media/dvb/frontends/at76c651.c @@ -41,7 +41,6 @@ #endif #include "dvb_frontend.h" -#include "dvb_functions.h" #define FRONTEND_NAME "dvbfe_at76c651" @@ -493,7 +492,7 @@ static int attach_adapter(struct i2c_adapter *adapter) BUG_ON(!state->dvb); - ret = dvb_register_frontend_new(at76c651_ioctl, state->dvb, state, + ret = dvb_register_frontend(at76c651_ioctl, state->dvb, state, &at76c651_info, THIS_MODULE); if (ret) { i2c_detach_client(client); diff --git a/linux/drivers/media/dvb/frontends/cx24110.c b/linux/drivers/media/dvb/frontends/cx24110.c index 56cafb25d..6f1efb975 100644 --- a/linux/drivers/media/dvb/frontends/cx24110.c +++ b/linux/drivers/media/dvb/frontends/cx24110.c @@ -39,7 +39,6 @@ #include <linux/init.h> #include "dvb_frontend.h" -#include "dvb_functions.h" #define FRONTEND_NAME "dvbfe_cx24110" @@ -694,7 +693,7 @@ static int attach_adapter (struct i2c_adapter *adapter) BUG_ON(!state->dvb); - if ((ret = dvb_register_frontend_new(cx24110_ioctl, state->dvb, state, + if ((ret = dvb_register_frontend(cx24110_ioctl, state->dvb, state, &cx24110_info, THIS_MODULE))) { i2c_detach_client(client); kfree(client); diff --git a/linux/drivers/media/dvb/frontends/dst.c b/linux/drivers/media/dvb/frontends/dst.c index 820594b90..b45541bec 100644 --- a/linux/drivers/media/dvb/frontends/dst.c +++ b/linux/drivers/media/dvb/frontends/dst.c @@ -30,7 +30,6 @@ #include <asm/div64.h> #include "dvb_frontend.h" -#include "dvb_functions.h" #include "dst-bt878.h" unsigned int dst_verbose = 0; @@ -1176,7 +1175,7 @@ static int attach_adapter(struct i2c_adapter *adapter) device_create_file(&client->dev, &dev_attr_client_type); device_create_file(&client->dev, &dev_attr_client_flags); - ret = dvb_register_frontend_new(dst_ioctl, dst->dvb, dst, info, THIS_MODULE); + ret = dvb_register_frontend(dst_ioctl, dst->dvb, dst, info, THIS_MODULE); if (ret) { i2c_detach_client(client); kfree(client); diff --git a/linux/drivers/media/dvb/frontends/dvb_dummy_fe.c b/linux/drivers/media/dvb/frontends/dvb_dummy_fe.c index c9160922d..c0df3632d 100644 --- a/linux/drivers/media/dvb/frontends/dvb_dummy_fe.c +++ b/linux/drivers/media/dvb/frontends/dvb_dummy_fe.c @@ -193,7 +193,7 @@ static int dvbdummyfe_attach_adapter(struct i2c_adapter *adapter) dvb = i2c_get_clientdata(client); BUG_ON(!dvb); - if ((ret = dvb_register_frontend_new(dvbdummyfe_ioctl, dvb, NULL, + if ((ret = dvb_register_frontend(dvbdummyfe_ioctl, dvb, NULL, frontend_info(), THIS_MODULE))) { kfree(client); return ret; diff --git a/linux/drivers/media/dvb/frontends/grundig_29504-401.c b/linux/drivers/media/dvb/frontends/grundig_29504-401.c index 1621c54de..f65deb115 100644 --- a/linux/drivers/media/dvb/frontends/grundig_29504-401.c +++ b/linux/drivers/media/dvb/frontends/grundig_29504-401.c @@ -30,7 +30,6 @@ #include <linux/slab.h> #include "dvb_frontend.h" -#include "dvb_functions.h" #define FRONTEND_NAME "dvbfe_l64781" @@ -670,7 +669,7 @@ static int l64781_attach_adapter(struct i2c_adapter *adapter) BUG_ON(!state->dvb); - if ((ret = dvb_register_frontend_new(l64781_ioctl, state->dvb, state, + if ((ret = dvb_register_frontend(l64781_ioctl, state->dvb, state, &l64781_info, THIS_MODULE))) { i2c_detach_client(client); kfree(state); diff --git a/linux/drivers/media/dvb/frontends/grundig_29504-491.c b/linux/drivers/media/dvb/frontends/grundig_29504-491.c index e5f7db343..4604df7e5 100644 --- a/linux/drivers/media/dvb/frontends/grundig_29504-491.c +++ b/linux/drivers/media/dvb/frontends/grundig_29504-491.c @@ -32,7 +32,6 @@ #include <linux/slab.h> #include "dvb_frontend.h" -#include "dvb_functions.h" #define FRONTEND_NAME "dvbfe_tda8083" @@ -476,7 +475,7 @@ static int tda8083_attach_adapter(struct i2c_adapter *adapter) BUG_ON(!state->dvb); - if ((ret = dvb_register_frontend_new(tda8083_ioctl, state->dvb, state, + if ((ret = dvb_register_frontend(tda8083_ioctl, state->dvb, state, &tda8083_info, THIS_MODULE))) { i2c_detach_client(client); kfree(state); diff --git a/linux/drivers/media/dvb/frontends/mt312.c b/linux/drivers/media/dvb/frontends/mt312.c index 17831e396..a687cd484 100644 --- a/linux/drivers/media/dvb/frontends/mt312.c +++ b/linux/drivers/media/dvb/frontends/mt312.c @@ -828,7 +828,7 @@ static int mt312_attach_adapter(struct i2c_adapter *adapter) BUG_ON(!state->dvb); - if ((ret = dvb_register_frontend_new(mt312_ioctl, state->dvb, state, + if ((ret = dvb_register_frontend(mt312_ioctl, state->dvb, state, &mt312_info, THIS_MODULE))) { i2c_detach_client(client); kfree(client); diff --git a/linux/drivers/media/dvb/frontends/mt352.c b/linux/drivers/media/dvb/frontends/mt352.c index 3ae72e832..4d9025628 100644 --- a/linux/drivers/media/dvb/frontends/mt352.c +++ b/linux/drivers/media/dvb/frontends/mt352.c @@ -825,7 +825,7 @@ static int mt352_attach_adapter(struct i2c_adapter *i2c) BUG_ON(!state->dvb); - if ((ret = dvb_register_frontend_new(mt352_ioctl, state->dvb, state, + if ((ret = dvb_register_frontend(mt352_ioctl, state->dvb, state, &mt352_info, THIS_MODULE))) { i2c_detach_client(client); kfree(client); diff --git a/linux/drivers/media/dvb/frontends/nxt6000.c b/linux/drivers/media/dvb/frontends/nxt6000.c index cb0346ce4..a0de801a5 100644 --- a/linux/drivers/media/dvb/frontends/nxt6000.c +++ b/linux/drivers/media/dvb/frontends/nxt6000.c @@ -775,7 +775,7 @@ static int attach_adapter(struct i2c_adapter *adapter) BUG_ON(!nxt->dvb); - ret = dvb_register_frontend_new(nxt6000_ioctl, nxt->dvb, nxt, &nxt6000_info, THIS_MODULE); + ret = dvb_register_frontend(nxt6000_ioctl, nxt->dvb, nxt, &nxt6000_info, THIS_MODULE); if (ret) { i2c_detach_client(client); goto out; diff --git a/linux/drivers/media/dvb/frontends/sp887x.c b/linux/drivers/media/dvb/frontends/sp887x.c index ef65b029b..716aa3437 100644 --- a/linux/drivers/media/dvb/frontends/sp887x.c +++ b/linux/drivers/media/dvb/frontends/sp887x.c @@ -23,7 +23,6 @@ #include <linux/firmware.h> #include "dvb_frontend.h" -#include "dvb_functions.h" #define FRONTEND_NAME "dvbfe_sp887x" @@ -627,7 +626,7 @@ static int attach_adapter(struct i2c_adapter *adapter) goto out; } - ret = dvb_register_frontend_new(sp887x_ioctl, state->dvb, state, + ret = dvb_register_frontend(sp887x_ioctl, state->dvb, state, &sp887x_info, THIS_MODULE); if (ret) { printk("sp887x: registering frontend to dvb-core failed.\n"); diff --git a/linux/drivers/media/dvb/frontends/stv0299.c b/linux/drivers/media/dvb/frontends/stv0299.c index 9957e1fe4..d3d6ccc99 100644 --- a/linux/drivers/media/dvb/frontends/stv0299.c +++ b/linux/drivers/media/dvb/frontends/stv0299.c @@ -54,7 +54,6 @@ #include <asm/div64.h> #include "dvb_frontend.h" -#include "dvb_functions.h" #define FRONTEND_NAME "dvbfe_stv0299" @@ -1399,7 +1398,7 @@ static int attach_adapter(struct i2c_adapter *adapter) BUG_ON(!state->dvb); - ret = dvb_register_frontend_new(uni0299_ioctl, state->dvb, state, + ret = dvb_register_frontend(uni0299_ioctl, state->dvb, state, &uni0299_info, THIS_MODULE); if (ret) { i2c_detach_client(client); diff --git a/linux/drivers/media/dvb/frontends/tda1004x.c b/linux/drivers/media/dvb/frontends/tda1004x.c index 888d83f4d..8442405f4 100644 --- a/linux/drivers/media/dvb/frontends/tda1004x.c +++ b/linux/drivers/media/dvb/frontends/tda1004x.c @@ -41,7 +41,6 @@ #include <linux/firmware.h> #include "dvb_frontend.h" -#include "dvb_functions.h" #define FRONTEND_NAME "dvbfe_tda1004x" @@ -1507,7 +1506,7 @@ static int attach_adapter(struct i2c_adapter *adapter) goto out; } - ret = dvb_register_frontend_new(tda1004x_ioctl, state->dvb, + ret = dvb_register_frontend(tda1004x_ioctl, state->dvb, state, &tda10045h_info, THIS_MODULE); break; @@ -1522,7 +1521,7 @@ static int attach_adapter(struct i2c_adapter *adapter) goto out; } - ret = dvb_register_frontend_new(tda1004x_ioctl, state->dvb, + ret = dvb_register_frontend(tda1004x_ioctl, state->dvb, state, &tda10046h_info, THIS_MODULE); break; diff --git a/linux/drivers/media/dvb/frontends/ves1820.c b/linux/drivers/media/dvb/frontends/ves1820.c index 255a40462..81be6180c 100644 --- a/linux/drivers/media/dvb/frontends/ves1820.c +++ b/linux/drivers/media/dvb/frontends/ves1820.c @@ -29,7 +29,6 @@ #include <linux/slab.h> #include "dvb_frontend.h" -#include "dvb_functions.h" /* I2C_DRIVERID_VES1820 is already defined in i2c-id.h */ @@ -562,7 +561,7 @@ static int attach_adapter(struct i2c_adapter *adapter) device_create_file(&client->dev, &dev_attr_client_name); - ret = dvb_register_frontend_new(ves1820_ioctl, state->dvb, state, &ves1820_info, THIS_MODULE); + ret = dvb_register_frontend(ves1820_ioctl, state->dvb, state, &ves1820_info, THIS_MODULE); if (ret) { i2c_detach_client(client); kfree(client); diff --git a/linux/drivers/media/dvb/frontends/ves1x93.c b/linux/drivers/media/dvb/frontends/ves1x93.c index 6b2436c66..497164011 100644 --- a/linux/drivers/media/dvb/frontends/ves1x93.c +++ b/linux/drivers/media/dvb/frontends/ves1x93.c @@ -30,7 +30,6 @@ #include <linux/slab.h> #include "dvb_frontend.h" -#include "dvb_functions.h" static int debug = 0; #define dprintk if (debug) printk @@ -636,7 +635,7 @@ static int attach_adapter(struct i2c_adapter *adapter) BUG_ON(!state->dvb); - ret = dvb_register_frontend_new(ves1x93_ioctl, state->dvb, state, + ret = dvb_register_frontend(ves1x93_ioctl, state->dvb, state, &ves1x93_info, THIS_MODULE); if (ret) { i2c_detach_client(client); diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c index 9a100f837..328168ccd 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.c +++ b/linux/drivers/media/dvb/ttpci/av7110.c @@ -59,7 +59,6 @@ #include <linux/dvb/frontend.h> #include "dvb_frontend.h" -#include "dvb_functions.h" #include "ttpci-eeprom.h" #include "av7110.h" diff --git a/linux/drivers/media/dvb/ttpci/av7110.h b/linux/drivers/media/dvb/ttpci/av7110.h index a11f950bc..f35b03163 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.h +++ b/linux/drivers/media/dvb/ttpci/av7110.h @@ -24,7 +24,6 @@ #include "dvb_filter.h" #include "dvb_net.h" #include "dvb_ringbuffer.h" -#include "dvb_functions.h" #include <media/saa7146_vv.h> diff --git a/linux/drivers/media/dvb/ttpci/av7110_av.c b/linux/drivers/media/dvb/ttpci/av7110_av.c index ec3fe823f..52633adee 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_av.c +++ b/linux/drivers/media/dvb/ttpci/av7110_av.c @@ -41,7 +41,6 @@ #include "av7110_hw.h" #include "av7110_av.h" #include "av7110_ipack.h" -#include "dvb_functions.h" /* MPEG-2 (ISO 13818 / H.222.0) stream types */ #define PROG_STREAM_MAP 0xBC diff --git a/linux/drivers/media/dvb/ttpci/av7110_ca.c b/linux/drivers/media/dvb/ttpci/av7110_ca.c index 7e31d3236..bb666b7d4 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_ca.c +++ b/linux/drivers/media/dvb/ttpci/av7110_ca.c @@ -40,7 +40,6 @@ #include "av7110.h" #include "av7110_hw.h" -#include "dvb_functions.h" void CI_handle(struct av7110 *av7110, u8 *data, u16 len) diff --git a/linux/drivers/media/dvb/ttpci/av7110_v4l.c b/linux/drivers/media/dvb/ttpci/av7110_v4l.c index c1d800f3f..e253c6f85 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_v4l.c +++ b/linux/drivers/media/dvb/ttpci/av7110_v4l.c @@ -38,7 +38,6 @@ #include "av7110.h" #include "av7110_hw.h" #include "av7110_av.h" -#include "dvb_functions.h" int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val) { diff --git a/linux/drivers/media/dvb/ttpci/budget-ci.c b/linux/drivers/media/dvb/ttpci/budget-ci.c index fdf150920..ae2891cfa 100644 --- a/linux/drivers/media/dvb/ttpci/budget-ci.c +++ b/linux/drivers/media/dvb/ttpci/budget-ci.c @@ -38,7 +38,6 @@ #include <linux/input.h> #include <linux/spinlock.h> -#include "dvb_functions.h" #include "dvb_ca_en50221.h" #define DEBIADDR_IR 0x1234 diff --git a/linux/drivers/media/dvb/ttpci/budget.c b/linux/drivers/media/dvb/ttpci/budget.c index 4a4750383..a90d7ad73 100644 --- a/linux/drivers/media/dvb/ttpci/budget.c +++ b/linux/drivers/media/dvb/ttpci/budget.c @@ -35,7 +35,6 @@ */ #include "budget.h" -#include "dvb_functions.h" static void Set22K (struct budget *budget, int state) { diff --git a/linux/drivers/media/dvb/ttpci/budget.h b/linux/drivers/media/dvb/ttpci/budget.h index a712c3d3d..69495e2c9 100644 --- a/linux/drivers/media/dvb/ttpci/budget.h +++ b/linux/drivers/media/dvb/ttpci/budget.h @@ -8,7 +8,6 @@ #include "dmxdev.h" #include "dvb_filter.h" #include "dvb_net.h" -#include "dvb_functions.h" #include <media/saa7146.h> diff --git a/linux/drivers/media/dvb/ttpci/ttpci-eeprom.c b/linux/drivers/media/dvb/ttpci/ttpci-eeprom.c index 07c7fb611..602071868 100644 --- a/linux/drivers/media/dvb/ttpci/ttpci-eeprom.c +++ b/linux/drivers/media/dvb/ttpci/ttpci-eeprom.c @@ -37,7 +37,6 @@ #include <linux/string.h> #include <linux/i2c.h> -#include "dvb_functions.h" #if 1 #define dprintk(x...) do { printk(x); } while (0) diff --git a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c index a0607e253..5eb51d78a 100644 --- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c @@ -29,8 +29,6 @@ #include <linux/dvb/dmx.h> #include <linux/pci.h> -#include "dvb_functions.h" - /* TTUSB_HWSECTIONS: the DSP supports filtering in hardware, however, since the "muxstream" diff --git a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c index f63916ecd..3ed39ed1b 100644 --- a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c @@ -1681,7 +1681,7 @@ static int ttusb_dec_3000s_frontend_ioctl(struct dvb_frontend *fe, static void ttusb_dec_init_frontend(struct ttusb_dec *dec) { int ret; - ret = dvb_register_frontend_new(dec->frontend_ioctl, dec->adapter, dec, dec->frontend_info, THIS_MODULE); + ret = dvb_register_frontend(dec->frontend_ioctl, dec->adapter, dec, dec->frontend_info, THIS_MODULE); } static void ttusb_dec_exit_frontend(struct ttusb_dec *dec) diff --git a/linux/drivers/media/dvb/vp7041/vp7041.c b/linux/drivers/media/dvb/vp7041/vp7041.c index 223fa4d6f..750441dec 100644 --- a/linux/drivers/media/dvb/vp7041/vp7041.c +++ b/linux/drivers/media/dvb/vp7041/vp7041.c @@ -816,7 +816,7 @@ static int vp7041_frontend_init(struct usb_vp7041 *vp) { int ret; - ret = dvb_register_frontend_new(vp7041_ioctl, vp->adapter, vp, &vp7041_frontend_info, THIS_MODULE); + ret = dvb_register_frontend(vp7041_ioctl, vp->adapter, vp, &vp7041_frontend_info, THIS_MODULE); if (ret) return ret; return 0; |