From a93c3fe7f05f5ab440f377360e5149f7234abb73 Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Tue, 9 Oct 2012 22:28:56 +0300
Subject: Drop redundant CHIP_NAME in mainboard.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Compose the name from Kconfig strings instead.

As the field is for debug print use only, a minor change in the output
should do no harm. The strings no longer include word "Mainboard".

Change-Id: Ifd24f408271eb5a5d1a08a317512ef00cb537ee2
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/1635
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
---
 src/mainboard/msi/ms6119/mainboard.c       | 1 -
 src/mainboard/msi/ms6147/mainboard.c       | 1 -
 src/mainboard/msi/ms6156/mainboard.c       | 1 -
 src/mainboard/msi/ms6178/mainboard.c       | 1 -
 src/mainboard/msi/ms7135/mainboard.c       | 1 -
 src/mainboard/msi/ms7260/mainboard.c       | 1 -
 src/mainboard/msi/ms9185/mainboard.c       | 1 -
 src/mainboard/msi/ms9282/mainboard.c       | 1 -
 src/mainboard/msi/ms9652_fam10/mainboard.c | 1 -
 9 files changed, 9 deletions(-)

(limited to 'src/mainboard/msi')

diff --git a/src/mainboard/msi/ms6119/mainboard.c b/src/mainboard/msi/ms6119/mainboard.c
index 7ef3d4b667..443b37576f 100644
--- a/src/mainboard/msi/ms6119/mainboard.c
+++ b/src/mainboard/msi/ms6119/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("MSI MS-6119 Mainboard")
 };
diff --git a/src/mainboard/msi/ms6147/mainboard.c b/src/mainboard/msi/ms6147/mainboard.c
index 091de541f9..a35a6f1e63 100644
--- a/src/mainboard/msi/ms6147/mainboard.c
+++ b/src/mainboard/msi/ms6147/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("MSI MS-6147 Mainboard")
 };
diff --git a/src/mainboard/msi/ms6156/mainboard.c b/src/mainboard/msi/ms6156/mainboard.c
index 28b5e81471..43f1738196 100644
--- a/src/mainboard/msi/ms6156/mainboard.c
+++ b/src/mainboard/msi/ms6156/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("MSI MS-6156 Mainboard")
 };
diff --git a/src/mainboard/msi/ms6178/mainboard.c b/src/mainboard/msi/ms6178/mainboard.c
index 009c134d52..7b22b875f2 100644
--- a/src/mainboard/msi/ms6178/mainboard.c
+++ b/src/mainboard/msi/ms6178/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("MSI MS-6178 Mainboard")
 };
diff --git a/src/mainboard/msi/ms7135/mainboard.c b/src/mainboard/msi/ms7135/mainboard.c
index 3ed0c6b345..5c30aaee74 100644
--- a/src/mainboard/msi/ms7135/mainboard.c
+++ b/src/mainboard/msi/ms7135/mainboard.c
@@ -21,5 +21,4 @@
 #include <device/device.h>
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("MSI MS7135 Mainboard")
 };
diff --git a/src/mainboard/msi/ms7260/mainboard.c b/src/mainboard/msi/ms7260/mainboard.c
index 06d606f7f4..641e352413 100644
--- a/src/mainboard/msi/ms7260/mainboard.c
+++ b/src/mainboard/msi/ms7260/mainboard.c
@@ -36,6 +36,5 @@ static void mainboard_enable(device_t dev)
 #endif
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("MSI K9N Neo (MS-7260) Mainboard")
 	// .enable_dev = mainboard_enable,
 };
diff --git a/src/mainboard/msi/ms9185/mainboard.c b/src/mainboard/msi/ms9185/mainboard.c
index f3e28d4349..d4b6ff8f10 100644
--- a/src/mainboard/msi/ms9185/mainboard.c
+++ b/src/mainboard/msi/ms9185/mainboard.c
@@ -26,5 +26,4 @@
 #include <device/pci_ops.h>
 
 struct chip_operations mainboard_ops = {
-       CHIP_NAME("MSI MS-9185 Mainboard")
 };
diff --git a/src/mainboard/msi/ms9282/mainboard.c b/src/mainboard/msi/ms9282/mainboard.c
index 800fd250cc..63c7ea7350 100644
--- a/src/mainboard/msi/ms9282/mainboard.c
+++ b/src/mainboard/msi/ms9282/mainboard.c
@@ -39,6 +39,5 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-       CHIP_NAME("MSI MS-9282 Mainboard")
        .enable_dev = mainboard_enable,
 };
diff --git a/src/mainboard/msi/ms9652_fam10/mainboard.c b/src/mainboard/msi/ms9652_fam10/mainboard.c
index e570607338..afb95d501d 100644
--- a/src/mainboard/msi/ms9652_fam10/mainboard.c
+++ b/src/mainboard/msi/ms9652_fam10/mainboard.c
@@ -39,6 +39,5 @@ static void mainboard_enable(device_t dev)
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("MSI MS-9652 Mainboard (Family 10)")
 	.enable_dev = mainboard_enable,
 };
-- 
cgit v1.2.3