> -dev_err(...);

What about pr_err, ...?

> While we're here, remove braces on if statements that only have one
> statement (manually).

You can let cocci do this for you, too. From the top of my head:

if (...)
- {
 S
- }

with S being a statement and this rule depending on the matching rule.