From d24fed391dc50f68d27a57364e51888b3a9266b6 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <anton@enomsg.org>
Date: Wed, 28 Aug 2013 17:45:07 -0700
Subject: bq24190_charger: Workaround SS definition problem on i386 builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For __i386__ builds we have:

arch/x86/include/uapi/asm/ptrace-abi.h:#define SS   16

And in the driver:

BQ24190_SYSFS_FIELD_RO(vbus_stat,       SS,     VBUS_STAT)

That breaks the build like this:

drivers/power/bq24190_charger.c:375:138: error: ‘BQ24190_REG_16’
undeclared here (not in a function)
drivers/power/bq24190_charger.c:375:162: error:
‘BQ24190_REG_16_THERM_STAT_MASK’ undeclared here (not in a function)
drivers/power/bq24190_charger.c:375:203: error:
‘BQ24190_REG_16_THERM_STAT_SHIFT’ undeclared here (not
 in a function)

With this commit we workaround the problem by undefining 'SS'.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>

diff --git a/drivers/power/bq24190_charger.c b/drivers/power/bq24190_charger.c
index 2b0f0e0..ad3ff8f 100644
--- a/drivers/power/bq24190_charger.c
+++ b/drivers/power/bq24190_charger.c
@@ -339,6 +339,9 @@ struct bq24190_sysfs_field_info {
 	u8	shift;
 };
 
+/* On i386 ptrace-abi.h defines SS that breaks the macro calls below. */
+#undef SS
+
 static struct bq24190_sysfs_field_info bq24190_sysfs_field_tbl[] = {
 			/*	sysfs name	reg	field in reg */
 	BQ24190_SYSFS_FIELD_RW(en_hiz,		ISC,	EN_HIZ),
-- 
cgit v0.10.2