diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 13:52:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-22 13:52:56 -0400 |
commit | 092e0e7e520a1fca03e13c9f2d157432a8657ff2 (patch) | |
tree | 451897252c4c08c4b5a8ef535da156f1e817e80b /drivers/media/dvb | |
parent | 79f14b7c56d3b3ba58f8b43d1f70b9b71477a800 (diff) | |
parent | 776c163b1b93c8dfa5edba885bc2bfbc2d228a5f (diff) |
Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
* 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
vfs: make no_llseek the default
vfs: don't use BKL in default_llseek
llseek: automatically add .llseek fop
libfs: use generic_file_llseek for simple_attr
mac80211: disallow seeks in minstrel debug code
lirc: make chardev nonseekable
viotape: use noop_llseek
raw: use explicit llseek file operations
ibmasmfs: use generic_file_llseek
spufs: use llseek in all file operations
arm/omap: use generic_file_llseek in iommu_debug
lkdtm: use generic_file_llseek in debugfs
net/wireless: use generic_file_llseek in debugfs
drm: use noop_llseek
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/bt8xx/dst_ca.c | 3 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dmxdev.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 1 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_frontend.c | 3 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_net.c | 1 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-core/dvbdev.c | 1 | ||||
-rw-r--r-- | drivers/media/dvb/firewire/firedtv-ci.c | 1 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/av7110.c | 1 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_av.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_ca.c | 1 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/av7110_ir.c | 1 |
11 files changed, 15 insertions, 2 deletions
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c index d75788b4e22..48e48e8af55 100644 --- a/drivers/media/dvb/bt8xx/dst_ca.c +++ b/drivers/media/dvb/bt8xx/dst_ca.c | |||
@@ -695,7 +695,8 @@ static const struct file_operations dst_ca_fops = { | |||
695 | .open = dst_ca_open, | 695 | .open = dst_ca_open, |
696 | .release = dst_ca_release, | 696 | .release = dst_ca_release, |
697 | .read = dst_ca_read, | 697 | .read = dst_ca_read, |
698 | .write = dst_ca_write | 698 | .write = dst_ca_write, |
699 | .llseek = noop_llseek, | ||
699 | }; | 700 | }; |
700 | 701 | ||
701 | static struct dvb_device dvbdev_ca = { | 702 | static struct dvb_device dvbdev_ca = { |
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c index 2de13b04b09..ad1f61d301e 100644 --- a/drivers/media/dvb/dvb-core/dmxdev.c +++ b/drivers/media/dvb/dvb-core/dmxdev.c | |||
@@ -1143,6 +1143,7 @@ static const struct file_operations dvb_demux_fops = { | |||
1143 | .open = dvb_demux_open, | 1143 | .open = dvb_demux_open, |
1144 | .release = dvb_demux_release, | 1144 | .release = dvb_demux_release, |
1145 | .poll = dvb_demux_poll, | 1145 | .poll = dvb_demux_poll, |
1146 | .llseek = default_llseek, | ||
1146 | }; | 1147 | }; |
1147 | 1148 | ||
1148 | static struct dvb_device dvbdev_demux = { | 1149 | static struct dvb_device dvbdev_demux = { |
@@ -1212,6 +1213,7 @@ static const struct file_operations dvb_dvr_fops = { | |||
1212 | .open = dvb_dvr_open, | 1213 | .open = dvb_dvr_open, |
1213 | .release = dvb_dvr_release, | 1214 | .release = dvb_dvr_release, |
1214 | .poll = dvb_dvr_poll, | 1215 | .poll = dvb_dvr_poll, |
1216 | .llseek = default_llseek, | ||
1215 | }; | 1217 | }; |
1216 | 1218 | ||
1217 | static struct dvb_device dvbdev_dvr = { | 1219 | static struct dvb_device dvbdev_dvr = { |
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c index 1723a984a52..4d0646da608 100644 --- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c | |||
@@ -1622,6 +1622,7 @@ static const struct file_operations dvb_ca_fops = { | |||
1622 | .open = dvb_ca_en50221_io_open, | 1622 | .open = dvb_ca_en50221_io_open, |
1623 | .release = dvb_ca_en50221_io_release, | 1623 | .release = dvb_ca_en50221_io_release, |
1624 | .poll = dvb_ca_en50221_io_poll, | 1624 | .poll = dvb_ca_en50221_io_poll, |
1625 | .llseek = noop_llseek, | ||
1625 | }; | 1626 | }; |
1626 | 1627 | ||
1627 | static struct dvb_device dvbdev_ca = { | 1628 | static struct dvb_device dvbdev_ca = { |
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c index 4d45b7d6b3f..970c9b8882d 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c | |||
@@ -2034,7 +2034,8 @@ static const struct file_operations dvb_frontend_fops = { | |||
2034 | .unlocked_ioctl = dvb_generic_ioctl, | 2034 | .unlocked_ioctl = dvb_generic_ioctl, |
2035 | .poll = dvb_frontend_poll, | 2035 | .poll = dvb_frontend_poll, |
2036 | .open = dvb_frontend_open, | 2036 | .open = dvb_frontend_open, |
2037 | .release = dvb_frontend_release | 2037 | .release = dvb_frontend_release, |
2038 | .llseek = noop_llseek, | ||
2038 | }; | 2039 | }; |
2039 | 2040 | ||
2040 | int dvb_register_frontend(struct dvb_adapter* dvb, | 2041 | int dvb_register_frontend(struct dvb_adapter* dvb, |
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c index a08032284cb..4df42aaae7f 100644 --- a/drivers/media/dvb/dvb-core/dvb_net.c +++ b/drivers/media/dvb/dvb-core/dvb_net.c | |||
@@ -1468,6 +1468,7 @@ static const struct file_operations dvb_net_fops = { | |||
1468 | .unlocked_ioctl = dvb_net_ioctl, | 1468 | .unlocked_ioctl = dvb_net_ioctl, |
1469 | .open = dvb_generic_open, | 1469 | .open = dvb_generic_open, |
1470 | .release = dvb_net_close, | 1470 | .release = dvb_net_close, |
1471 | .llseek = noop_llseek, | ||
1471 | }; | 1472 | }; |
1472 | 1473 | ||
1473 | static struct dvb_device dvbdev_net = { | 1474 | static struct dvb_device dvbdev_net = { |
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c index 28f486edcaf..f7328777595 100644 --- a/drivers/media/dvb/dvb-core/dvbdev.c +++ b/drivers/media/dvb/dvb-core/dvbdev.c | |||
@@ -105,6 +105,7 @@ static const struct file_operations dvb_device_fops = | |||
105 | { | 105 | { |
106 | .owner = THIS_MODULE, | 106 | .owner = THIS_MODULE, |
107 | .open = dvb_device_open, | 107 | .open = dvb_device_open, |
108 | .llseek = noop_llseek, | ||
108 | }; | 109 | }; |
109 | 110 | ||
110 | static struct cdev dvb_device_cdev; | 111 | static struct cdev dvb_device_cdev; |
diff --git a/drivers/media/dvb/firewire/firedtv-ci.c b/drivers/media/dvb/firewire/firedtv-ci.c index d3c2cf60de7..8ffb565f070 100644 --- a/drivers/media/dvb/firewire/firedtv-ci.c +++ b/drivers/media/dvb/firewire/firedtv-ci.c | |||
@@ -220,6 +220,7 @@ static const struct file_operations fdtv_ca_fops = { | |||
220 | .open = dvb_generic_open, | 220 | .open = dvb_generic_open, |
221 | .release = dvb_generic_release, | 221 | .release = dvb_generic_release, |
222 | .poll = fdtv_ca_io_poll, | 222 | .poll = fdtv_ca_io_poll, |
223 | .llseek = noop_llseek, | ||
223 | }; | 224 | }; |
224 | 225 | ||
225 | static struct dvb_device fdtv_ca = { | 226 | static struct dvb_device fdtv_ca = { |
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index a6be529eec5..893fbc57c72 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/dvb/ttpci/av7110.c | |||
@@ -730,6 +730,7 @@ static const struct file_operations dvb_osd_fops = { | |||
730 | .unlocked_ioctl = dvb_generic_ioctl, | 730 | .unlocked_ioctl = dvb_generic_ioctl, |
731 | .open = dvb_generic_open, | 731 | .open = dvb_generic_open, |
732 | .release = dvb_generic_release, | 732 | .release = dvb_generic_release, |
733 | .llseek = noop_llseek, | ||
733 | }; | 734 | }; |
734 | 735 | ||
735 | static struct dvb_device dvbdev_osd = { | 736 | static struct dvb_device dvbdev_osd = { |
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c index 13efba942da..6ef3996565a 100644 --- a/drivers/media/dvb/ttpci/av7110_av.c +++ b/drivers/media/dvb/ttpci/av7110_av.c | |||
@@ -1521,6 +1521,7 @@ static const struct file_operations dvb_video_fops = { | |||
1521 | .open = dvb_video_open, | 1521 | .open = dvb_video_open, |
1522 | .release = dvb_video_release, | 1522 | .release = dvb_video_release, |
1523 | .poll = dvb_video_poll, | 1523 | .poll = dvb_video_poll, |
1524 | .llseek = noop_llseek, | ||
1524 | }; | 1525 | }; |
1525 | 1526 | ||
1526 | static struct dvb_device dvbdev_video = { | 1527 | static struct dvb_device dvbdev_video = { |
@@ -1539,6 +1540,7 @@ static const struct file_operations dvb_audio_fops = { | |||
1539 | .open = dvb_audio_open, | 1540 | .open = dvb_audio_open, |
1540 | .release = dvb_audio_release, | 1541 | .release = dvb_audio_release, |
1541 | .poll = dvb_audio_poll, | 1542 | .poll = dvb_audio_poll, |
1543 | .llseek = noop_llseek, | ||
1542 | }; | 1544 | }; |
1543 | 1545 | ||
1544 | static struct dvb_device dvbdev_audio = { | 1546 | static struct dvb_device dvbdev_audio = { |
diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c index 4eba35a018e..43f61f2eca9 100644 --- a/drivers/media/dvb/ttpci/av7110_ca.c +++ b/drivers/media/dvb/ttpci/av7110_ca.c | |||
@@ -353,6 +353,7 @@ static const struct file_operations dvb_ca_fops = { | |||
353 | .open = dvb_ca_open, | 353 | .open = dvb_ca_open, |
354 | .release = dvb_generic_release, | 354 | .release = dvb_generic_release, |
355 | .poll = dvb_ca_poll, | 355 | .poll = dvb_ca_poll, |
356 | .llseek = default_llseek, | ||
356 | }; | 357 | }; |
357 | 358 | ||
358 | static struct dvb_device dvbdev_ca = { | 359 | static struct dvb_device dvbdev_ca = { |
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c index b070e88d8c6..908f272fe26 100644 --- a/drivers/media/dvb/ttpci/av7110_ir.c +++ b/drivers/media/dvb/ttpci/av7110_ir.c | |||
@@ -312,6 +312,7 @@ static ssize_t av7110_ir_proc_write(struct file *file, const char __user *buffer | |||
312 | static const struct file_operations av7110_ir_proc_fops = { | 312 | static const struct file_operations av7110_ir_proc_fops = { |
313 | .owner = THIS_MODULE, | 313 | .owner = THIS_MODULE, |
314 | .write = av7110_ir_proc_write, | 314 | .write = av7110_ir_proc_write, |
315 | .llseek = noop_llseek, | ||
315 | }; | 316 | }; |
316 | 317 | ||
317 | /* interrupt handler */ | 318 | /* interrupt handler */ |