Bluetooth: Use kernel int types instead of ones from stdint.h

u8/__u8/u32/etc should be used in the kernel instead of stdint.h types.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 05bd9aca4054fdbf247df0587e3b39a5b68b6493..0c54fcfe7e0f2b2b089402809176dc6c08f83b33 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -691,8 +691,8 @@ struct hci_cp_host_buffer_size {
 
 #define HCI_OP_WRITE_EIR               0x0c52
 struct hci_cp_write_eir {
-       uint8_t         fec;
-       uint8_t         data[HCI_MAX_EIR_LENGTH];
+       __u8            fec;
+       __u8            data[HCI_MAX_EIR_LENGTH];
 } __packed;
 
 #define HCI_OP_READ_SSP_MODE           0x0c55

diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c
index 17800b1d28ea33c4d3b36801cdc1092a2930b88f..9f9c8dcd8af01bbae591733a093344126f0b9500 100644 (file)
--- a/net/bluetooth/bnep/sock.c
+++ b/net/bluetooth/bnep/sock.c
@@ -143,10 +143,10 @@ static int bnep_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne
 {
        if (cmd == BNEPGETCONNLIST) {
                struct bnep_connlist_req cl;
-               uint32_t uci;
+               u32 uci;
                int err;
 
-               if (get_user(cl.cnum, (uint32_t __user *) arg) ||
+               if (get_user(cl.cnum, (u32 __user *) arg) ||
                                get_user(uci, (u32 __user *) (arg + 4)))
                        return -EFAULT;
 
@@ -157,7 +157,7 @@ static int bnep_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne
 
                err = bnep_get_connlist(&cl);
 
-               if (!err && put_user(cl.cnum, (uint32_t __user *) arg))
+               if (!err && put_user(cl.cnum, (u32 __user *) arg))
                        err = -EFAULT;
 
                return err;

diff --git a/net/bluetooth/cmtp/sock.c b/net/bluetooth/cmtp/sock.c
index 3f2dd5c25ae516f3d267f1f038cb151af21c04c8..1230faaac29b01c54abac33a4913851db085ab22 100644 (file)
--- a/net/bluetooth/cmtp/sock.c
+++ b/net/bluetooth/cmtp/sock.c
@@ -137,10 +137,10 @@ static int cmtp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne
 {
        if (cmd == CMTPGETCONNLIST) {
                struct cmtp_connlist_req cl;
-               uint32_t uci;
+               u32 uci;
                int err;
 
-               if (get_user(cl.cnum, (uint32_t __user *) arg) ||
+               if (get_user(cl.cnum, (u32 __user *) arg) ||
                                get_user(uci, (u32 __user *) (arg + 4)))
                        return -EFAULT;
 
@@ -151,7 +151,7 @@ static int cmtp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne
 
                err = cmtp_get_connlist(&cl);
 
-               if (!err && put_user(cl.cnum, (uint32_t __user *) arg))
+               if (!err && put_user(cl.cnum, (u32 __user *) arg))
                        err = -EFAULT;
 
                return err;

diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c
index 178ac7f127adcace1c672eddff2a55e10f0be1f1..73a32d705c1fc14f423c5178c367ee4064cd9284 100644 (file)
--- a/net/bluetooth/hidp/sock.c
+++ b/net/bluetooth/hidp/sock.c
@@ -160,10 +160,10 @@ static int hidp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne
 {
        if (cmd == HIDPGETCONNLIST) {
                struct hidp_connlist_req cl;
-               uint32_t uci;
+               u32 uci;
                int err;
 
-               if (get_user(cl.cnum, (uint32_t __user *) arg) ||
+               if (get_user(cl.cnum, (u32 __user *) arg) ||
                                get_user(uci, (u32 __user *) (arg + 4)))
                        return -EFAULT;
 
@@ -174,7 +174,7 @@ static int hidp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne
 
                err = hidp_get_connlist(&cl);
 
-               if (!err && put_user(cl.cnum, (uint32_t __user *) arg))
+               if (!err && put_user(cl.cnum, (u32 __user *) arg))
                        err = -EFAULT;
 
                return err;

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 07e31f73f7033da794e06e8fb6d9c56fd0113294..27830f4016989f512278f07be069f5937a8bd8fe 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1075,7 +1075,7 @@ static int set_link_security(struct sock *sk, u16 index, void *data, u16 len)
        struct mgmt_mode *cp = data;
        struct pending_cmd *cmd;
        struct hci_dev *hdev;
-       uint8_t val;
+       u8 val;
        int err;
 
        BT_DBG("request for hci%u", index);
@@ -1147,7 +1147,7 @@ static int set_ssp(struct sock *sk, u16 index, void *data, u16 len)
        struct mgmt_mode *cp = data;
        struct pending_cmd *cmd;
        struct hci_dev *hdev;
-       uint8_t val;
+       u8 val;
        int err;
 
        BT_DBG("request for hci%u", index);