diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-15 16:13:34 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-15 16:13:34 -0500 |
| commit | 79d891c1bbb6573cef31dbc2030fba61cfa1df6d (patch) | |
| tree | 35a384bd5584a217ae63d33020879afb6a076713 /drivers/net/can/slcan.c | |
| parent | 5138eb9b2a744f780194b292bffd8638c7a6d423 (diff) | |
| parent | ff847ee47be27621f978921919f035fcd87d6d08 (diff) | |
| download | kernel_replicant_linux-79d891c1bbb6573cef31dbc2030fba61cfa1df6d.tar.gz kernel_replicant_linux-79d891c1bbb6573cef31dbc2030fba61cfa1df6d.tar.bz2 kernel_replicant_linux-79d891c1bbb6573cef31dbc2030fba61cfa1df6d.zip | |
Merge tag 'linux-can-next-for-4.16-20180105' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2017-12-01,Re: pull-request: can-next
this is a pull request of 7 patches for net-next/master.
All patches are by me. Patch 6 is for the "can_raw" protocol and add
error checking to the bind() function. All other patches clean up the
coding style and remove unused parameters in various CAN drivers and
infrastructure.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/slcan.c')
| -rw-r--r-- | drivers/net/can/slcan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/slcan.c b/drivers/net/can/slcan.c index 5d067c1b987f..89d60d8e467c 100644 --- a/drivers/net/can/slcan.c +++ b/drivers/net/can/slcan.c @@ -508,7 +508,7 @@ static void slc_sync(void) } /* Find a free SLCAN channel, and link in this `tty' line. */ -static struct slcan *slc_alloc(dev_t line) +static struct slcan *slc_alloc(void) { int i; char name[IFNAMSIZ]; @@ -583,7 +583,7 @@ static int slcan_open(struct tty_struct *tty) /* OK. Find a free SLCAN channel to use. */ err = -ENFILE; - sl = slc_alloc(tty_devnum(tty)); + sl = slc_alloc(); if (sl == NULL) goto err_exit; |