Revert the DS_SUSPENDED addition, since it's no longer used.
Move the resume to *after* the config restore.  This matches existing behavior.
bus_generic_suspend/bus_generic_resume() no longer apply.