Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp3011989ybi; Mon, 17 Jun 2019 14:39:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqwvtgI2dE1STLTRm00LYN08T6WPewYltzA7YsYaB+osUBx2cRqnV5db640M7Fyw1WUn3rMj X-Received: by 2002:a17:90a:cd04:: with SMTP id d4mr1279886pju.128.1560807576182; Mon, 17 Jun 2019 14:39:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560807576; cv=none; d=google.com; s=arc-20160816; b=fynFlE94OArSOMm+Miwiw9WxNc4msFgpg9+gPbJ6MPa2/4vKRmqh73sHlJBmQaHgS+ sctPU7xAooltp7OLLKST1wUlnUaoDU8O6kiM5EELqBqAgr1gkueP7Wimbhes5upNicaV BfHjxAfPsYFxwl6shJykmbr/bhb2WMbCFv8AIXUR96hM8UlqgiccHmmVBHyHjftU7VFu WZy3SMmFjNlaVcTxMiruQ/pPbEYN2YTVk3Eo4QLJqftptwwobqJHysvxzAv/QPtKFwyU vgkr8CQ9jvpeLjCCmM9p9YrEAms9C8bIvgmrMv6jHUn29oDOhAeFmlArMHrJgI+DCZ4D 7sSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=iGib/5lBQl5ym4fuK+3sqXcRmCyoA+tWpkoMAzd217k=; b=qrM/IXZaNre3Q4ytfbh5OLQNJjFaFcyniaylZONyDT6da+kfODqB9hWBnHsh9NZ7Z4 OmS/i4LKHc+SGgx2sZMEEAiPdN3Z4FhzV2RD3gvHoY9AhWlr4AeMW/SMO4jJSiFgiJhI qUNN1CA0M9QzfCana7Vu/SjfytgcBf0/KjQ8baN7koFEA7Dozns+Mesfu6wnCAQk3zQn g0EVr8dqFwDP7S+Dmh5wn+Rc7s0aQZepsdCjHiPMxELpWpZkJfUXaV503psxEa9/ts5A vnuwteZGlZ/uHs7jGH7k9SEdy6NNC9fWLhJ9q5T8DI5RWZl0TBdiZZ8d27nxgthHt5V1 xs8g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l2si336725pju.5.2019.06.17.14.39.05; Mon, 17 Jun 2019 14:39:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727419AbfFQVjE (ORCPT + 99 others); Mon, 17 Jun 2019 17:39:04 -0400 Received: from mga14.intel.com ([192.55.52.115]:35437 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726538AbfFQVjE (ORCPT ); Mon, 17 Jun 2019 17:39:04 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jun 2019 14:39:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,386,1557212400"; d="scan'208";a="185881454" Received: from vkalpanx-mobl.amr.corp.intel.com (HELO ingas-nuc1.sea.intel.com) ([10.251.134.56]) by fmsmga002.fm.intel.com with ESMTP; 17 Jun 2019 14:39:03 -0700 From: Inga Stotland To: linux-bluetooth@vger.kernel.org Cc: brian.gix@intel.com, Inga Stotland Subject: [PATCH BlueZ] mesh: Clean up includes Date: Mon, 17 Jun 2019 14:38:47 -0700 Message-Id: <20190617213847.21705-1-inga.stotland@intel.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This adds #include for json-c/json.h in mesh-db.h and removes this include from the other files that don't need to reference json-c. --- mesh/cfgmod-server.c | 2 -- mesh/mesh-db.c | 1 - mesh/mesh-db.h | 2 ++ mesh/model.c | 2 -- mesh/node.c | 1 - mesh/storage.c | 1 - 6 files changed, 2 insertions(+), 7 deletions(-) diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c index 060d7f4e4..2f61d841c 100644 --- a/mesh/cfgmod-server.c +++ b/mesh/cfgmod-server.c @@ -24,8 +24,6 @@ #include #include -#include "json-c/json.h" - #include "mesh/mesh-defs.h" #include "mesh/node.h" #include "mesh/net.h" diff --git a/mesh/mesh-db.c b/mesh/mesh-db.c index e0a000261..f3807070f 100644 --- a/mesh/mesh-db.c +++ b/mesh/mesh-db.c @@ -27,7 +27,6 @@ #include #include -#include #include "mesh/mesh-defs.h" #include "mesh/util.h" diff --git a/mesh/mesh-db.h b/mesh/mesh-db.h index da5efa12a..8fb0eb291 100644 --- a/mesh/mesh-db.h +++ b/mesh/mesh-db.h @@ -17,6 +17,8 @@ * */ +#include + struct mesh_db_sub { bool virt; union { diff --git a/mesh/model.c b/mesh/model.c index f29ad9af2..4b5605af6 100644 --- a/mesh/model.c +++ b/mesh/model.c @@ -23,10 +23,8 @@ #include #include -#include #include "mesh/mesh-defs.h" - #include "mesh/mesh.h" #include "mesh/crypto.h" #include "mesh/node.h" diff --git a/mesh/node.c b/mesh/node.c index e99858623..c8d0fac2e 100644 --- a/mesh/node.c +++ b/mesh/node.c @@ -26,7 +26,6 @@ #include #include -#include #include "mesh/mesh-defs.h" #include "mesh/mesh.h" diff --git a/mesh/storage.c b/mesh/storage.c index 1a9945aa8..6cb280c39 100644 --- a/mesh/storage.c +++ b/mesh/storage.c @@ -30,7 +30,6 @@ #include #include -#include #include #include "mesh/mesh-defs.h" -- 2.21.0