From 541d06b7dc1cd3ad4722850f3a7f5df12b8d6fba Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Fri, 9 Oct 2020 10:08:48 -0400 Subject: [PATCH 12/14] pc-bios/s390-ccw/main: Remove superfluous call to enable_subchannel() RH-Author: Thomas Huth Message-id: <20201009100849.264994-9-thuth@redhat.com> Patchwork-id: 98602 O-Subject: [RHEL-8.4.0 qemu-kvm PATCH 8/9] pc-bios/s390-ccw/main: Remove superfluous call to enable_subchannel() Bugzilla: 1846975 RH-Acked-by: Jens Freimann RH-Acked-by: David Hildenbrand RH-Acked-by: Cornelia Huck enable_subchannel() is already done during is_dev_possibly_bootable() (which is called from find_boot_device() -> find_subch()), so there is no need to do this again in the main() function. Message-Id: <20200806105349.632-9-thuth@redhat.com> Reviewed-by: Cornelia Huck Signed-off-by: Thomas Huth (cherry picked from commit 49d4388ec03fd8c7701b907a4e11c437a28f8572) Signed-off-by: Danilo C. L. de Paula --- pc-bios/s390-ccw/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c index b5c721c395..e3a1a3053d 100644 --- a/pc-bios/s390-ccw/main.c +++ b/pc-bios/s390-ccw/main.c @@ -289,7 +289,6 @@ int main(void) boot_setup(); if (have_iplb) { find_boot_device(); - enable_subchannel(blk_schid); ipl_boot_device(); } else { probe_boot_device(); -- 2.27.0