And remove the now unneeded number field.
Also fixes all drivers that set these fields.
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>