From: Kulikov Vasiliy <firstname.lastname@example.org>
Since patch #5 and #6 are doing the same change to different
files in the same driver, I combined them into one commit.
There is no need to split things up with so much granularity.
If it's all in the same driver, doing the same transformation,
keep it all in one patch.