[PATCH] htirq: tidy up the htirq code