bootctl: Drop unnecessary calls to calculate dimensions
Since scene_calc_dims() is done by scene_arrange(), we don't need to do an explicit call to scene_calc_dims() first. Drop it from both UIs. Signed-off-by: Simon Glass <simon.glass@canonical.com>
This commit is contained in:
@@ -426,10 +426,6 @@ static int multiboot_ui_add(struct udevice *dev, struct osinfo *info)
|
||||
|
||||
multiboot_set_item_props(scn, seq, &info->bflow);
|
||||
|
||||
ret = expo_calc_dims(upriv->expo);
|
||||
if (ret)
|
||||
return log_msg_ret("ecd", ret);
|
||||
|
||||
if (lpriv->default_os &&
|
||||
!strcmp(lpriv->default_os, info->bflow.os_name))
|
||||
scene_menu_select_item(scn, OBJ_MENU, ITEM + seq);
|
||||
@@ -498,11 +494,6 @@ static int multiboot_ui_switch_layout(struct udevice *dev)
|
||||
return log_msg_ret("props", ret);
|
||||
}
|
||||
|
||||
/* Calculate dimensions then re-arrange */
|
||||
ret = expo_calc_dims(upriv->expo);
|
||||
if (ret)
|
||||
return log_msg_ret("ecd", ret);
|
||||
|
||||
ret = scene_arrange(scn);
|
||||
if (ret)
|
||||
return log_msg_ret("arr", ret);
|
||||
|
||||
@@ -156,10 +156,6 @@ static int simple_ui_add(struct udevice *dev, struct osinfo *info)
|
||||
if (ret)
|
||||
return log_msg_ret("asn", ret);
|
||||
|
||||
ret = expo_calc_dims(upriv->expo);
|
||||
if (ret)
|
||||
return log_msg_ret("ecd", ret);
|
||||
|
||||
if (lpriv->default_os &&
|
||||
!strcmp(lpriv->default_os, info->bflow.os_name))
|
||||
scene_menu_select_item(scn, OBJ_MENU, ITEM + seq);
|
||||
|
||||
Reference in New Issue
Block a user