2 files changed, 5 insertions, 10 deletions

diff --git a/net/bluetooth/cmtp/Kconfig b/net/bluetooth/cmtp/Kconfig
index d6b0382f6f3a..94cbf42ce155 100644
--- a/net/bluetooth/cmtp/Kconfig
+++ b/net/bluetooth/cmtp/Kconfig
@@ -1,6 +1,6 @@
 config BT_CMTP
         tristate "CMTP protocol support"
-        depends on BT && BT_L2CAP && ISDN_CAPI
+        depends on BT && ISDN_CAPI
         help
           CMTP (CAPI Message Transport Protocol) is a transport layer
           for CAPI messages.  CMTP is required for the Bluetooth Common
diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
index 5a6e634f7fca..6c9c1fd601ca 100644
--- a/net/bluetooth/cmtp/core.c
+++ b/net/bluetooth/cmtp/core.c
@@ -53,15 +53,13 @@ static LIST_HEAD(cmtp_session_list);
 static struct cmtp_session *__cmtp_get_session(bdaddr_t *bdaddr)
 {
         struct cmtp_session *session;
-        struct list_head *p;
 
         BT_DBG("");
 
-        list_for_each(p, &cmtp_session_list) {
-                session = list_entry(p, struct cmtp_session, list);
+        list_for_each_entry(session, &cmtp_session_list, list)
                 if (!bacmp(bdaddr, &session->bdaddr))
                         return session;
-        }
+
         return NULL;
 }
 
@@ -432,19 +430,16 @@ int cmtp_del_connection(struct cmtp_conndel_req *req)
 
 int cmtp_get_connlist(struct cmtp_connlist_req *req)
 {
-        struct list_head *p;
+        struct cmtp_session *session;
         int err = 0, n = 0;
 
         BT_DBG("");
 
         down_read(&cmtp_session_sem);
 
-        list_for_each(p, &cmtp_session_list) {
-                struct cmtp_session *session;
+        list_for_each_entry(session, &cmtp_session_list, list) {
                 struct cmtp_conninfo ci;
 
-                session = list_entry(p, struct cmtp_session, list);
-
                 __cmtp_copy_session(session, &ci);
 
                 if (copy_to_user(req->ci, &ci, sizeof(ci))) {