Skip to content

Commit 984652d

Browse files
author
Christoph Hellwig
committed
net: remove sock_no_poll
Now that sock_poll handles a NULL ->poll or ->poll_mask there is no need for a stub. Signed-off-by: Christoph Hellwig <[email protected]>
1 parent 1525242 commit 984652d

File tree

10 files changed

+0
-17
lines changed

10 files changed

+0
-17
lines changed

crypto/af_alg.c

-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,6 @@ static const struct proto_ops alg_proto_ops = {
347347
.sendpage = sock_no_sendpage,
348348
.sendmsg = sock_no_sendmsg,
349349
.recvmsg = sock_no_recvmsg,
350-
.poll = sock_no_poll,
351350

352351
.bind = alg_bind,
353352
.release = af_alg_release,

crypto/algif_hash.c

-2
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@ static struct proto_ops algif_hash_ops = {
288288
.mmap = sock_no_mmap,
289289
.bind = sock_no_bind,
290290
.setsockopt = sock_no_setsockopt,
291-
.poll = sock_no_poll,
292291

293292
.release = af_alg_release,
294293
.sendmsg = hash_sendmsg,
@@ -396,7 +395,6 @@ static struct proto_ops algif_hash_ops_nokey = {
396395
.mmap = sock_no_mmap,
397396
.bind = sock_no_bind,
398397
.setsockopt = sock_no_setsockopt,
399-
.poll = sock_no_poll,
400398

401399
.release = af_alg_release,
402400
.sendmsg = hash_sendmsg_nokey,

crypto/algif_rng.c

-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ static struct proto_ops algif_rng_ops = {
106106
.bind = sock_no_bind,
107107
.accept = sock_no_accept,
108108
.setsockopt = sock_no_setsockopt,
109-
.poll = sock_no_poll,
110109
.sendmsg = sock_no_sendmsg,
111110
.sendpage = sock_no_sendpage,
112111

drivers/isdn/mISDN/socket.c

-1
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,6 @@ static const struct proto_ops base_sock_ops = {
745745
.getname = sock_no_getname,
746746
.sendmsg = sock_no_sendmsg,
747747
.recvmsg = sock_no_recvmsg,
748-
.poll = sock_no_poll,
749748
.listen = sock_no_listen,
750749
.shutdown = sock_no_shutdown,
751750
.setsockopt = sock_no_setsockopt,

drivers/net/ppp/pptp.c

-1
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,6 @@ static const struct proto_ops pptp_ops = {
624624
.socketpair = sock_no_socketpair,
625625
.accept = sock_no_accept,
626626
.getname = pptp_getname,
627-
.poll = sock_no_poll,
628627
.listen = sock_no_listen,
629628
.shutdown = sock_no_shutdown,
630629
.setsockopt = sock_no_setsockopt,

include/net/sock.h

-2
Original file line numberDiff line numberDiff line change
@@ -1591,8 +1591,6 @@ int sock_no_connect(struct socket *, struct sockaddr *, int, int);
15911591
int sock_no_socketpair(struct socket *, struct socket *);
15921592
int sock_no_accept(struct socket *, struct socket *, int, bool);
15931593
int sock_no_getname(struct socket *, struct sockaddr *, int);
1594-
__poll_t sock_no_poll(struct file *, struct socket *,
1595-
struct poll_table_struct *);
15961594
int sock_no_ioctl(struct socket *, unsigned int, unsigned long);
15971595
int sock_no_listen(struct socket *, int);
15981596
int sock_no_shutdown(struct socket *, int);

net/bluetooth/bnep/sock.c

-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ static const struct proto_ops bnep_sock_ops = {
175175
.getname = sock_no_getname,
176176
.sendmsg = sock_no_sendmsg,
177177
.recvmsg = sock_no_recvmsg,
178-
.poll = sock_no_poll,
179178
.listen = sock_no_listen,
180179
.shutdown = sock_no_shutdown,
181180
.setsockopt = sock_no_setsockopt,

net/bluetooth/cmtp/sock.c

-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ static const struct proto_ops cmtp_sock_ops = {
178178
.getname = sock_no_getname,
179179
.sendmsg = sock_no_sendmsg,
180180
.recvmsg = sock_no_recvmsg,
181-
.poll = sock_no_poll,
182181
.listen = sock_no_listen,
183182
.shutdown = sock_no_shutdown,
184183
.setsockopt = sock_no_setsockopt,

net/bluetooth/hidp/sock.c

-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ static const struct proto_ops hidp_sock_ops = {
208208
.getname = sock_no_getname,
209209
.sendmsg = sock_no_sendmsg,
210210
.recvmsg = sock_no_recvmsg,
211-
.poll = sock_no_poll,
212211
.listen = sock_no_listen,
213212
.shutdown = sock_no_shutdown,
214213
.setsockopt = sock_no_setsockopt,

net/core/sock.c

-6
Original file line numberDiff line numberDiff line change
@@ -2567,12 +2567,6 @@ int sock_no_getname(struct socket *sock, struct sockaddr *saddr,
25672567
}
25682568
EXPORT_SYMBOL(sock_no_getname);
25692569

2570-
__poll_t sock_no_poll(struct file *file, struct socket *sock, poll_table *pt)
2571-
{
2572-
return 0;
2573-
}
2574-
EXPORT_SYMBOL(sock_no_poll);
2575-
25762570
int sock_no_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
25772571
{
25782572
return -EOPNOTSUPP;

0 commit comments

Comments
 (0)