goldfish: clean up staging ifdefs

Use the write helpers and add an audio helper

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/staging/goldfish/goldfish_audio.c
Simple merge

diff --cc drivers/staging/goldfish/goldfish_nand.c
Simple merge

diff --cc drivers/staging/goldfish/goldfish_nand_reg.h
Simple merge