[PATCH 0/6] ch_driver: Misc cleanups