Merge tag 'tty-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[tomoyo/tomoyo-test1.git] / drivers / bluetooth / hci_ldisc.c

diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index a76eb98..a26367e 100644 (file)
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -599,7 +599,7 @@ static void hci_uart_tty_wakeup(struct tty_struct *tty)
  * Return Value:    None
  */
 static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data,
-                                const char *flags, int count)
+                                const u8 *flags, size_t count)
 {
        struct hci_uart *hu = tty->disc_data;
 
@@ -807,20 +807,14 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
  * We don't provide read/write/poll interface for user space.
  */
 static ssize_t hci_uart_tty_read(struct tty_struct *tty, struct file *file,
-                                unsigned char *buf, size_t nr,
-                                void **cookie, unsigned long offset)
+                                u8 *buf, size_t nr, void **cookie,
+                                unsigned long offset)
 {
        return 0;
 }
 
 static ssize_t hci_uart_tty_write(struct tty_struct *tty, struct file *file,
-                                 const unsigned char *data, size_t count)
-{
-       return 0;
-}
-
-static __poll_t hci_uart_tty_poll(struct tty_struct *tty,
-                                     struct file *filp, poll_table *wait)
+                                 const u8 *data, size_t count)
 {
        return 0;
 }
@@ -835,7 +829,6 @@ static struct tty_ldisc_ops hci_uart_ldisc = {
        .write          = hci_uart_tty_write,
        .ioctl          = hci_uart_tty_ioctl,
        .compat_ioctl   = hci_uart_tty_ioctl,
-       .poll           = hci_uart_tty_poll,
        .receive_buf    = hci_uart_tty_receive,
        .write_wakeup   = hci_uart_tty_wakeup,
 };