simplify hotplug regexp
remove more dead code
DRY hotplug devices matching

There is difference in "pci" value. I don't see any reason why to have
it different, so there is definitivelly in one of case bug. Let's see
who complain about it and fix it so it works in all cases.