bcm2835_aux: cleanup in preparation for upstreaming