linux-next: tree build failure

[Stephen Rothwell]

Hi Liam,

Today's linux-next build (powerpc allyesconfig) failed like this:

drivers/regulator/twl-regulator.c: In function 'twlreg_disable':
drivers/regulator/twl-regulator.c:158: error: 'P1_GRP' undeclared (first use in this function)
drivers/regulator/twl-regulator.c:158: error: 'P2_GRP' undeclared (first use in this function)
drivers/regulator/twl-regulator.c:158: error: 'P3_GRP' undeclared (first use in this function)
drivers/regulator/twl-regulator.c: At top level:
drivers/regulator/twl-regulator.c:358: error: 'twlldo_list_voltage' undeclared here (not in a function)
drivers/regulator/twl-regulator.c:450:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:450: error: 'TWL_ADJUSTABLE_LDO' undeclared here (not in a function)
drivers/regulator/twl-regulator.c:451:40: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:452:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:453:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:454:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:455:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:456:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:457:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:458:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:459:34: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:460:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:461:40: error: macro "TWL_FIXED_LDO" requires 5 arguments, but only 4 given
drivers/regulator/twl-regulator.c:461: error: 'TWL_FIXED_LDO' undeclared here (not in a function)
drivers/regulator/twl-regulator.c:462:39: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:463:39: error: macro "TWL_FIXED_LDO" requires 5 arguments, but only 4 given
drivers/regulator/twl-regulator.c:464:34: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:465:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:466:35: error: macro "TWL_ADJUSTABLE_LDO" requires 4 arguments, but only 3 given
drivers/regulator/twl-regulator.c:467:39: error: macro "TWL_FIXED_LDO" requires 5 arguments, but only 4 given
drivers/regulator/twl-regulator.c:468:39: error: macro "TWL_FIXED_LDO" requires 5 arguments, but only 4 given
drivers/regulator/twl-regulator.c:469:39: error: macro "TWL_FIXED_LDO" requires 5 arguments, but only 4 given
drivers/regulator/twl-regulator.c:474: error: 'VAUX1_6030_VSEL_table' undeclared here (not in a function)
drivers/regulator/twl-regulator.c:474: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:474: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:474: error: negative width in bit-field '<anonymous>'
drivers/regulator/twl-regulator.c:474: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:474: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:474: error: negative width in bit-field '<anonymous>'
drivers/regulator/twl-regulator.c:475: error: 'VAUX2_6030_VSEL_table' undeclared here (not in a function)
drivers/regulator/twl-regulator.c:475: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:475: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:475: error: negative width in bit-field '<anonymous>'
drivers/regulator/twl-regulator.c:475: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:475: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:475: error: negative width in bit-field '<anonymous>'
drivers/regulator/twl-regulator.c:476: error: 'VAUX3_6030_VSEL_table' undeclared here (not in a function)
drivers/regulator/twl-regulator.c:476: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:476: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:476: error: negative width in bit-field '<anonymous>'
drivers/regulator/twl-regulator.c:476: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:476: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:476: error: negative width in bit-field '<anonymous>'
drivers/regulator/twl-regulator.c:477: error: 'VMMC_VSEL_table' undeclared here (not in a function)
drivers/regulator/twl-regulator.c:477: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:477: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:477: error: negative width in bit-field '<anonymous>'
drivers/regulator/twl-regulator.c:477: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:477: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:477: error: negative width in bit-field '<anonymous>'
drivers/regulator/twl-regulator.c:478: error: 'VPP_VSEL_table' undeclared here (not in a function)
drivers/regulator/twl-regulator.c:478: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:478: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:478: error: negative width in bit-field '<anonymous>'
drivers/regulator/twl-regulator.c:478: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:478: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:478: error: negative width in bit-field '<anonymous>'
drivers/regulator/twl-regulator.c:479: error: 'VUSIM_VSEL_table' undeclared here (not in a function)
drivers/regulator/twl-regulator.c:479: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:479: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:479: error: negative width in bit-field '<anonymous>'
drivers/regulator/twl-regulator.c:479: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:479: warning: type defaults to 'int' in declaration of 'type name'
drivers/regulator/twl-regulator.c:479: error: negative width in bit-field '<anonymous>'
drivers/regulator/twl-regulator.c: In function 'twlreg_probe':
drivers/regulator/twl-regulator.c:544: error: implicit declaration of function 'twl4030reg_write'

I guess we knew this was coming :-(

Caused by a bad rebase of the voltage tree onto Linus' tree (in order to
do fixups for commit fc7b92fca4e546184557f1c53f84ad57c66b7695 "mfd:
Rename all twl4030_i2c*" and others).

I have reverted all the commits in the voltage tree that touched
drivers/regulator/twl-regulator.c for today:

6051d7a2786c57d0c5c4227dd9ddfc348a86ce91 "twl4030-regulator: Fixes VAUX1-3 exclusion introduced"
2677c78184a52edcc228c20a1c05c14925118293 "Reset REMAP configuration in regulator probe"
de449258306274739ed3a747f49b9ac8f91f9e4a "Define critical regulators as always_on"
66d65d352f6fd61dd5695925906b140f1e0ac9c3 "twl4030-regulator: Add all TWL regulators to twreg_info"
f33a0d47bd44dbf44a45c33b32e1e3bbbf8d06e6 "twl4030-regulator: Remove regulator from all groups when disabling"

Please fix up this tree properly.  You may have been better off merging
Linus' tree into yours and fixing up the merge commit than trying to do
the rebase.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature