Robert, here is the first version of the rework for your comments as of February 14th. 1. I merged hwsampler_files.c contents into init.c 2. I added a struct as you proposed. It is not clear to me how you want me to merge the static functions. One possibility I'm seeing is to merge log_sample, op_add_code, and op_add_sample? Heinz -- To unsubscribe from this list: send the line "unsubscribe linux-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html