Additionally convert some known to be good usages to the new
names.
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>