Remove duplicated descriptor structures and make it easier to discover
bugs.
Signed-off-by: David Yang <mmyangfl@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>