summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Bettis <jbettis@google.com>2023-04-03 19:40:31 +0000
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-04-04 17:22:08 +0000
commitce8161dc470c28e7228d6651f9b675f327c71963 (patch)
tree63f4e8e320c3b0e0d648132095f338e019ca4f1f
parent2921b0afa3d759533666f31ececae3f3c732de26 (diff)
downloadchrome-ec-ce8161dc470c28e7228d6651f9b675f327c71963.tar.gz
ec: Remove unnecessary #line directives
Now that we don't #include <autoconf.h> we should not need any of these. BRANCH=None BUG=b:272518464 TEST=Build coverage report at various problem commits Change-Id: I5152c64fce75b34b6269ea0a9fe7d8c8e2b1840e Signed-off-by: Jeremy Bettis <jbettis@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4396146 Reviewed-by: Keith Short <keithshort@chromium.org> Commit-Queue: Jeremy Bettis <jbettis@chromium.org> Tested-by: Jeremy Bettis <jbettis@chromium.org>
-rw-r--r--driver/accel_bma4xx.c6
-rw-r--r--include/chipset.h6
-rw-r--r--include/common.h7
-rw-r--r--include/config.h7
-rw-r--r--include/i2c.h7
-rw-r--r--include/usb_pd_tcpm.h7
-rw-r--r--include/watchdog.h7
7 files changed, 0 insertions, 47 deletions
diff --git a/driver/accel_bma4xx.c b/driver/accel_bma4xx.c
index 4120f726c3..3d6c7caa12 100644
--- a/driver/accel_bma4xx.c
+++ b/driver/accel_bma4xx.c
@@ -23,12 +23,6 @@
#include <motion_sense_fifo.h>
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 31
-
#ifdef CONFIG_ACCEL_BMA4XX_INT_EVENT
#define BMA4XX_USE_INTERRUPTS
#endif
diff --git a/include/chipset.h b/include/chipset.h
index 2ec7d3b059..ead2a9680e 100644
--- a/include/chipset.h
+++ b/include/chipset.h
@@ -10,12 +10,6 @@
* all main chipsets (x86, gaia, etc.).
*/
-/*
- * TODO(b/272518464): Work around coreboot GCC preprocessor bug.
- * #line marks the *next* line, so it is off by one.
- */
-#line 18
-
#ifndef __CROS_EC_CHIPSET_H
#define __CROS_EC_CHIPSET_H
diff --git a/include/common.h b/include/common.h
index 496fa42247..02f7449d81 100644
--- a/include/common.h
+++ b/include/common.h
@@ -8,13 +8,6 @@
#ifndef __CROS_EC_COMMON_H
#define __CROS_EC_COMMON_H
-/*
- * I don't know why but gcc's preprocessor doesn't like the autoconf.h file,
- * sometimes. Adding a #line directive anywhere in this file seems to fix the
- * problem. #line marks the *next* line, so it is off by one.
- */
-#line 17
-
#include "compile_time_macros.h"
#include <inttypes.h>
diff --git a/include/config.h b/include/config.h
index 53882c396d..93226bc43f 100644
--- a/include/config.h
+++ b/include/config.h
@@ -19,13 +19,6 @@
#define __CROS_EC_CONFIG_H
/*
- * I don't know why but gcc's preprocessor doesn't like the autoconf.h file,
- * sometimes. Adding a #line directive anywhere in this file seems to fix the
- * problem. #line marks the *next* line, so it is off by one.
- */
-#line 27
-
-/*
* When building for Zephyr tests, a shimmed_tasks.h header is defined
* to create all the HAS_TASK_* definitions. Since those are used in
* config.h, we need to include that header first.
diff --git a/include/i2c.h b/include/i2c.h
index 741b578ec8..4da9306abb 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -8,13 +8,6 @@
#ifndef __CROS_EC_I2C_H
#define __CROS_EC_I2C_H
-/*
- * I don't know why but gcc's preprocessor doesn't like the autoconf.h file,
- * sometimes. Adding a #line directive anywhere in this file seems to fix the
- * problem. #line marks the *next* line, so it is off by one.
- */
-#line 17
-
#include "common.h"
#include "gpio_signal.h"
#include "host_command.h"
diff --git a/include/usb_pd_tcpm.h b/include/usb_pd_tcpm.h
index 0311f155b3..3860ca5d4f 100644
--- a/include/usb_pd_tcpm.h
+++ b/include/usb_pd_tcpm.h
@@ -8,13 +8,6 @@
#ifndef __CROS_EC_USB_PD_TCPM_H
#define __CROS_EC_USB_PD_TCPM_H
-/*
- * I don't know why but gcc's preprocessor doesn't like this file,
- * sometimes. Adding a #line directive anywhere in this file seems to fix the
- * problem. #line marks the *next* line, so it is off by one.
- */
-#line 17
-
#include "common.h"
#include "compiler.h"
#include "ec_commands.h"
diff --git a/include/watchdog.h b/include/watchdog.h
index 6955f128ff..5e6e5626e6 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -8,13 +8,6 @@
#ifndef __CROS_EC_WATCHDOG_H
#define __CROS_EC_WATCHDOG_H
-/*
- * I don't know why but gcc's preprocessor doesn't like this file,
- * sometimes. Adding a #line directive anywhere in this file seems to fix the
- * problem. #line marks the *next* line, so it is off by one.
- */
-#line 17
-
#include "config.h"
#include <stdint.h>