diff mbox

[5/6] linux-generic: kill odp_impl.c

Message ID 1423638605-6342-6-git-send-email-maxim.uvarov@linaro.org
State New
Headers show

Commit Message

Maxim Uvarov Feb. 11, 2015, 7:10 a.m. UTC
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
---
 platform/linux-generic/Makefile.am   |  1 -
 platform/linux-generic/odp_impl.c    | 16 ----------------
 platform/linux-generic/odp_version.c |  8 ++++++++
 3 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 platform/linux-generic/odp_impl.c

Comments

Taras Kondratiuk Feb. 16, 2015, 11:45 a.m. UTC | #1
On 02/11/2015 09:10 AM, Maxim Uvarov wrote:
> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
> ---
>  platform/linux-generic/Makefile.am   |  1 -
>  platform/linux-generic/odp_impl.c    | 16 ----------------
>  platform/linux-generic/odp_version.c |  8 ++++++++
>  3 files changed, 8 insertions(+), 17 deletions(-)
>  delete mode 100644 platform/linux-generic/odp_impl.c

If odp_impl.c is removed, then why clean-up patches #1 and #4 are
needed?
Maxim Uvarov Feb. 16, 2015, 12:27 p.m. UTC | #2
On 02/16/2015 02:45 PM, Taras Kondratiuk wrote:
> On 02/11/2015 09:10 AM, Maxim Uvarov wrote:
>> Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
>> ---
>>   platform/linux-generic/Makefile.am   |  1 -
>>   platform/linux-generic/odp_impl.c    | 16 ----------------
>>   platform/linux-generic/odp_version.c |  8 ++++++++
>>   3 files changed, 8 insertions(+), 17 deletions(-)
>>   delete mode 100644 platform/linux-generic/odp_impl.c
> If odp_impl.c is removed, then why clean-up patches #1 and #4 are
> needed?
>
The idea was to fix artifacts in #1 and #4 and here do just replacement 
of code chunks to different file.
For me it's match more clear when all this changes are in one patch: 
"[PATCHv4] api: fix odp_version_api_str()"

Now I'm very confusing what I have to do with that patch series. Should 
I merge some patches or simple fix extern C in
first one and resend?

Maxim.
diff mbox

Patch

diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index f1580d5..b77b05b 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -143,7 +143,6 @@  __LIB__libodp_la_SOURCES = \
 			   odp_errno.c \
 			   odp_event.c \
 			   odp_init.c \
-			   odp_impl.c \
 			   odp_linux.c \
 			   odp_packet.c \
 			   odp_packet_flags.c \
diff --git a/platform/linux-generic/odp_impl.c b/platform/linux-generic/odp_impl.c
deleted file mode 100644
index 3ad7e53..0000000
--- a/platform/linux-generic/odp_impl.c
+++ /dev/null
@@ -1,16 +0,0 @@ 
-/* Copyright (c) 2014, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier:     BSD-3-Clause
- */
-
-
-#include <odp/version.h>
-
-#define  ODP_VERSION_IMPL 0
-#define  ODP_VERSION_IMPL_STR ODP_VERSION_TO_STR(ODP_VERSION_IMPL)
-
-const char *odp_version_impl_str(void)
-{
-	return ODP_VERSION_IMPL_STR;
-}
diff --git a/platform/linux-generic/odp_version.c b/platform/linux-generic/odp_version.c
index 2a7cd6e..d54580c 100644
--- a/platform/linux-generic/odp_version.c
+++ b/platform/linux-generic/odp_version.c
@@ -15,3 +15,11 @@  const char *odp_version_api_str(void)
 {
 	return ODP_VERSION_API_STR;
 }
+
+#define  ODP_VERSION_IMPL 0
+#define  ODP_VERSION_IMPL_STR ODP_VERSION_TO_STR(ODP_VERSION_IMPL)
+
+const char *odp_version_impl_str(void)
+{
+	return ODP_VERSION_IMPL_STR;
+}