> +void __device_get_disk(struct gendisk *disk) This function can be static. Also it is a bit misnamed. I'm not really sure this split is worth it, but if we really want to kill off the argument it might be worth to just open code the new __device_get_disk in both callers.