Buck Showalter happy to have Chris Davis back