axp209: Various fixes from upstream review

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
axp152: Various fixes from upstream review

Signed-off-by: Hans de Goede <hdegoede@redhat.com>