aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2012-02-26 06:04:52 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-27 05:34:39 -0500
commit816a11d5ced501d368fabe09172f3d62744e8b53 (patch)
treee4f3a0879ad41c7bc06b2e8f2b65a38502c44f4f /net/bluetooth
parent9b27f350688c9399da10c2b888c4044c2c1bd923 (diff)
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>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/bnep/sock.c6
-rw-r--r--net/bluetooth/cmtp/sock.c6
-rw-r--r--net/bluetooth/hidp/sock.c6
-rw-r--r--net/bluetooth/mgmt.c4
4 files changed, 11 insertions, 11 deletions
diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c
index 17800b1d28ea..9f9c8dcd8af0 100644
--- 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
143{ 143{
144 if (cmd == BNEPGETCONNLIST) { 144 if (cmd == BNEPGETCONNLIST) {
145 struct bnep_connlist_req cl; 145 struct bnep_connlist_req cl;
146 uint32_t uci; 146 u32 uci;
147 int err; 147 int err;
148 148
149 if (get_user(cl.cnum, (uint32_t __user *) arg) || 149 if (get_user(cl.cnum, (u32 __user *) arg) ||
150 get_user(uci, (u32 __user *) (arg + 4))) 150 get_user(uci, (u32 __user *) (arg + 4)))
151 return -EFAULT; 151 return -EFAULT;
152 152
@@ -157,7 +157,7 @@ static int bnep_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne
157 157
158 err = bnep_get_connlist(&cl); 158 err = bnep_get_connlist(&cl);
159 159
160 if (!err && put_user(cl.cnum, (uint32_t __user *) arg)) 160 if (!err && put_user(cl.cnum, (u32 __user *) arg))
161 err = -EFAULT; 161 err = -EFAULT;
162 162
163 return err; 163 return err;
diff --git a/net/bluetooth/cmtp/sock.c b/net/bluetooth/cmtp/sock.c
index 3f2dd5c25ae5..1230faaac29b 100644
--- 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
137{ 137{
138 if (cmd == CMTPGETCONNLIST) { 138 if (cmd == CMTPGETCONNLIST) {
139 struct cmtp_connlist_req cl; 139 struct cmtp_connlist_req cl;
140 uint32_t uci; 140 u32 uci;
141 int err; 141 int err;
142 142
143 if (get_user(cl.cnum, (uint32_t __user *) arg) || 143 if (get_user(cl.cnum, (u32 __user *) arg) ||
144 get_user(uci, (u32 __user *) (arg + 4))) 144 get_user(uci, (u32 __user *) (arg + 4)))
145 return -EFAULT; 145 return -EFAULT;
146 146
@@ -151,7 +151,7 @@ static int cmtp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne
151 151
152 err = cmtp_get_connlist(&cl); 152 err = cmtp_get_connlist(&cl);
153 153
154 if (!err && put_user(cl.cnum, (uint32_t __user *) arg)) 154 if (!err && put_user(cl.cnum, (u32 __user *) arg))
155 err = -EFAULT; 155 err = -EFAULT;
156 156
157 return err; 157 return err;
diff --git a/net/bluetooth/hidp/sock.c b/net/bluetooth/hidp/sock.c
index 178ac7f127ad..73a32d705c1f 100644
--- 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
160{ 160{
161 if (cmd == HIDPGETCONNLIST) { 161 if (cmd == HIDPGETCONNLIST) {
162 struct hidp_connlist_req cl; 162 struct hidp_connlist_req cl;
163 uint32_t uci; 163 u32 uci;
164 int err; 164 int err;
165 165
166 if (get_user(cl.cnum, (uint32_t __user *) arg) || 166 if (get_user(cl.cnum, (u32 __user *) arg) ||
167 get_user(uci, (u32 __user *) (arg + 4))) 167 get_user(uci, (u32 __user *) (arg + 4)))
168 return -EFAULT; 168 return -EFAULT;
169 169
@@ -174,7 +174,7 @@ static int hidp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne
174 174
175 err = hidp_get_connlist(&cl); 175 err = hidp_get_connlist(&cl);
176 176
177 if (!err && put_user(cl.cnum, (uint32_t __user *) arg)) 177 if (!err && put_user(cl.cnum, (u32 __user *) arg))
178 err = -EFAULT; 178 err = -EFAULT;
179 179
180 return err; 180 return err;
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 07e31f73f703..27830f401698 100644
--- 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)
1075 struct mgmt_mode *cp = data; 1075 struct mgmt_mode *cp = data;
1076 struct pending_cmd *cmd; 1076 struct pending_cmd *cmd;
1077 struct hci_dev *hdev; 1077 struct hci_dev *hdev;
1078 uint8_t val; 1078 u8 val;
1079 int err; 1079 int err;
1080 1080
1081 BT_DBG("request for hci%u", index); 1081 BT_DBG("request for hci%u", index);
@@ -1147,7 +1147,7 @@ static int set_ssp(struct sock *sk, u16 index, void *data, u16 len)
1147 struct mgmt_mode *cp = data; 1147 struct mgmt_mode *cp = data;
1148 struct pending_cmd *cmd; 1148 struct pending_cmd *cmd;
1149 struct hci_dev *hdev; 1149 struct hci_dev *hdev;
1150 uint8_t val; 1150 u8 val;
1151 int err; 1151 int err;
1152 1152
1153 BT_DBG("request for hci%u", index); 1153 BT_DBG("request for hci%u", index);