Add a more clean separation between global, common CIS information
and the function specific one as we need the common information in
places where no specific function is specified.
Signed-off-by: NPierre Ossman <drzeus@drzeus.cx>