Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[firefly-linux-kernel-4.4.55.git] / net / bluetooth / cmtp / capi.c

diff --git a/net/bluetooth/cmtp/capi.c b/net/bluetooth/cmtp/capi.c
index b0c6c6af76ef07c311ea940d482b3d45ab83696d..9a50338772f3af9875c83f628e110ffa6458781a 100644 (file)
--- a/net/bluetooth/cmtp/capi.c
+++ b/net/bluetooth/cmtp/capi.c
@@ -100,9 +100,9 @@ static void cmtp_application_del(struct cmtp_session *session, struct cmtp_appli
 static struct cmtp_application *cmtp_application_get(struct cmtp_session *session, int pattern, __u16 value)
 {
        struct cmtp_application *app;
-       struct list_head *p, *n;
+       struct list_head *p;
 
-       list_for_each_safe(p, n, &session->applications) {
+       list_for_each(p, &session->applications) {
                app = list_entry(p, struct cmtp_application, list);
                switch (pattern) {
                case CMTP_MSGNUM:
@@ -511,13 +511,13 @@ static int cmtp_proc_show(struct seq_file *m, void *v)
        struct capi_ctr *ctrl = m->private;
        struct cmtp_session *session = ctrl->driverdata;
        struct cmtp_application *app;
-       struct list_head *p, *n;
+       struct list_head *p;
 
        seq_printf(m, "%s\n\n", cmtp_procinfo(ctrl));
        seq_printf(m, "addr %s\n", session->name);
        seq_printf(m, "ctrl %d\n", session->num);
 
-       list_for_each_safe(p, n, &session->applications) {
+       list_for_each(p, &session->applications) {
                app = list_entry(p, struct cmtp_application, list);
                seq_printf(m, "appl %d -> %d\n", app->appl, app->mapping);
        }