bq24190_charger: Workaround SS definition problem on i386 builds
authorAnton Vorontsov <anton@enomsg.org>
Thu, 29 Aug 2013 00:45:07 +0000 (17:45 -0700)
committerAnton Vorontsov <anton@enomsg.org>
Thu, 29 Aug 2013 00:52:50 +0000 (17:52 -0700)
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>
drivers/power/bq24190_charger.c

index 2b0f0e0..ad3ff8f 100644 (file)
@@ -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),