fixes sparse warning, and removes potentially dangerous name from namespace.
Signed-off-by: Dave Airlie <airlied@redhat.com>