Commit c0802f99 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds

[PATCH] rempove CONFIG_DVB_DEVFS_ONLY

Adrian Bunk noticed that there's an exposed config option to use the
now gone DEVFS_FL_AUTO_DEVNUM in the dvb code - remove it.
parent 00f2029a
...@@ -5,13 +5,3 @@ config DVB_CORE ...@@ -5,13 +5,3 @@ config DVB_CORE
DVB core utility functions for device handling, software fallbacks etc. DVB core utility functions for device handling, software fallbacks etc.
Say Y when you have a DVB card and want to use it. If unsure say N. Say Y when you have a DVB card and want to use it. If unsure say N.
config DVB_DEVFS_ONLY
bool "devfs only"
depends on DVB_CORE=y && DEVFS_FS
help
Drop support for old major/minor device scheme and support only devfs
systems. This saves some code.
If unsure say N.
...@@ -21,8 +21,6 @@ ...@@ -21,8 +21,6 @@
* *
*/ */
/*#define CONFIG_DVB_DEVFS_ONLY 1*/
#include <linux/config.h> #include <linux/config.h>
#include <linux/version.h> #include <linux/version.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -56,17 +54,8 @@ static char *dnames[] = { ...@@ -56,17 +54,8 @@ static char *dnames[] = {
}; };
#ifdef CONFIG_DVB_DEVFS_ONLY #define DVB_MAX_IDS 4
#define nums2minor(num,type,id) ((num << 6) | (id << 4) | type)
#define DVB_MAX_IDS ~0
#define nums2minor(num,type,id) 0
#define DVB_DEVFS_FLAGS (DEVFS_FL_DEFAULT|DEVFS_FL_AUTO_DEVNUM)
#else
#define DVB_MAX_IDS 4
#define nums2minor(num,type,id) ((num << 6) | (id << 4) | type)
#define DVB_DEVFS_FLAGS (DEVFS_FL_DEFAULT)
static static
...@@ -234,8 +223,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, ...@@ -234,8 +223,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
sprintf(name, "%s%d", dnames[type], id); sprintf(name, "%s%d", dnames[type], id);
dvbdev->devfs_handle = devfs_register(adap->devfs_handle, name, dvbdev->devfs_handle = devfs_register(adap->devfs_handle, name,
DVB_DEVFS_FLAGS, 0, DVB_MAJOR,
DVB_MAJOR,
nums2minor(adap->num, type, id), nums2minor(adap->num, type, id),
S_IFCHR | S_IRUSR | S_IWUSR, S_IFCHR | S_IRUSR | S_IWUSR,
dvbdev->fops, dvbdev); dvbdev->fops, dvbdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment