| Message ID | 20200319000430.362006-1-colin.king@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | ACPI: crsdump: include crsdump.h in crsdump.h, rename guard macro | expand |
On 2020-03-18 6:04 p.m., Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > crsdump.c should be including crsdump.h to get the definition of > function resource_dump. Also rename the macro guard to include the > ACPI prefix. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/acpi/crsdump/crsdump.c | 3 +-- > src/acpi/crsdump/crsdump.h | 4 ++-- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/src/acpi/crsdump/crsdump.c b/src/acpi/crsdump/crsdump.c > index 39212338..5c68f802 100644 > --- a/src/acpi/crsdump/crsdump.c > +++ b/src/acpi/crsdump/crsdump.c > @@ -27,6 +27,7 @@ > #include <unistd.h> > #include <inttypes.h> > #include "fwts_acpi_object_eval.h" > +#include "crsdump.h" > > typedef struct { > const char *label; /* Field label */ > @@ -855,8 +856,6 @@ static void crsdump_large_resource_items( > fwts_log_nl(fw); > } > > - > - > int resource_dump(fwts_framework *fw, const char *objname) > { > fwts_list_link *item; > diff --git a/src/acpi/crsdump/crsdump.h b/src/acpi/crsdump/crsdump.h > index da3241b1..f9c3f42f 100644 > --- a/src/acpi/crsdump/crsdump.h > +++ b/src/acpi/crsdump/crsdump.h > @@ -16,8 +16,8 @@ > * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. > * > */ > -#ifndef __CRSDUMP_H__ > -#define __CRSDUMP_H__ > +#ifndef __FWTS_ACPI_CRSDUMP_H__ > +#define __FWTS_ACPI_CRSDUMP_H__ > > #include "fwts.h" > > Acked-by: Alex Hung <alex.hung@canonical.com>
On 3/19/20 8:04 AM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > crsdump.c should be including crsdump.h to get the definition of > function resource_dump. Also rename the macro guard to include the > ACPI prefix. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/acpi/crsdump/crsdump.c | 3 +-- > src/acpi/crsdump/crsdump.h | 4 ++-- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/src/acpi/crsdump/crsdump.c b/src/acpi/crsdump/crsdump.c > index 39212338..5c68f802 100644 > --- a/src/acpi/crsdump/crsdump.c > +++ b/src/acpi/crsdump/crsdump.c > @@ -27,6 +27,7 @@ > #include <unistd.h> > #include <inttypes.h> > #include "fwts_acpi_object_eval.h" > +#include "crsdump.h" > > typedef struct { > const char *label; /* Field label */ > @@ -855,8 +856,6 @@ static void crsdump_large_resource_items( > fwts_log_nl(fw); > } > > - > - > int resource_dump(fwts_framework *fw, const char *objname) > { > fwts_list_link *item; > diff --git a/src/acpi/crsdump/crsdump.h b/src/acpi/crsdump/crsdump.h > index da3241b1..f9c3f42f 100644 > --- a/src/acpi/crsdump/crsdump.h > +++ b/src/acpi/crsdump/crsdump.h > @@ -16,8 +16,8 @@ > * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. > * > */ > -#ifndef __CRSDUMP_H__ > -#define __CRSDUMP_H__ > +#ifndef __FWTS_ACPI_CRSDUMP_H__ > +#define __FWTS_ACPI_CRSDUMP_H__ > > #include "fwts.h" > > Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff --git a/src/acpi/crsdump/crsdump.c b/src/acpi/crsdump/crsdump.c index 39212338..5c68f802 100644 --- a/src/acpi/crsdump/crsdump.c +++ b/src/acpi/crsdump/crsdump.c @@ -27,6 +27,7 @@ #include <unistd.h> #include <inttypes.h> #include "fwts_acpi_object_eval.h" +#include "crsdump.h" typedef struct { const char *label; /* Field label */ @@ -855,8 +856,6 @@ static void crsdump_large_resource_items( fwts_log_nl(fw); } - - int resource_dump(fwts_framework *fw, const char *objname) { fwts_list_link *item; diff --git a/src/acpi/crsdump/crsdump.h b/src/acpi/crsdump/crsdump.h index da3241b1..f9c3f42f 100644 --- a/src/acpi/crsdump/crsdump.h +++ b/src/acpi/crsdump/crsdump.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ -#ifndef __CRSDUMP_H__ -#define __CRSDUMP_H__ +#ifndef __FWTS_ACPI_CRSDUMP_H__ +#define __FWTS_ACPI_CRSDUMP_H__ #include "fwts.h"