summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/rfcomm
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-03-12 13:52:35 -0400
committerMarcel Holtmann <marcel@holtmann.org>2014-03-12 14:10:17 -0400
commitdcf4adbfdc7ad14ca50c1133f93f998c78493c2d (patch)
treef1ab021f3730ba5607a26a9a711f10855a3c9c8e /net/bluetooth/rfcomm
parent4340a124dea6a6a66c7889261574a48e57e8782a (diff)
Bluetooth: Convert uses of __constant_<foo> to <foo>
The use of __constant_<foo> has been unnecessary for quite awhile now. Make these uses consistent with the rest of the kernel. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/rfcomm')
-rw-r--r--net/bluetooth/rfcomm/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 21e15318937c..633cceeb943e 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -768,7 +768,7 @@ static struct rfcomm_session *rfcomm_session_create(bdaddr_t *src,
768 768
769 bacpy(&addr.l2_bdaddr, dst); 769 bacpy(&addr.l2_bdaddr, dst);
770 addr.l2_family = AF_BLUETOOTH; 770 addr.l2_family = AF_BLUETOOTH;
771 addr.l2_psm = __constant_cpu_to_le16(RFCOMM_PSM); 771 addr.l2_psm = cpu_to_le16(RFCOMM_PSM);
772 addr.l2_cid = 0; 772 addr.l2_cid = 0;
773 addr.l2_bdaddr_type = BDADDR_BREDR; 773 addr.l2_bdaddr_type = BDADDR_BREDR;
774 *err = kernel_connect(sock, (struct sockaddr *) &addr, sizeof(addr), O_NONBLOCK); 774 *err = kernel_connect(sock, (struct sockaddr *) &addr, sizeof(addr), O_NONBLOCK);
@@ -2032,7 +2032,7 @@ static int rfcomm_add_listener(bdaddr_t *ba)
2032 /* Bind socket */ 2032 /* Bind socket */
2033 bacpy(&addr.l2_bdaddr, ba); 2033 bacpy(&addr.l2_bdaddr, ba);
2034 addr.l2_family = AF_BLUETOOTH; 2034 addr.l2_family = AF_BLUETOOTH;
2035 addr.l2_psm = __constant_cpu_to_le16(RFCOMM_PSM); 2035 addr.l2_psm = cpu_to_le16(RFCOMM_PSM);
2036 addr.l2_cid = 0; 2036 addr.l2_cid = 0;
2037 addr.l2_bdaddr_type = BDADDR_BREDR; 2037 addr.l2_bdaddr_type = BDADDR_BREDR;
2038 err = kernel_bind(sock, (struct sockaddr *) &addr, sizeof(addr)); 2038 err = kernel_bind(sock, (struct sockaddr *) &addr, sizeof(addr));