From 4abde346714bf1ab981c060751b8c9ba887ca8b9 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Wed, 13 Jun 2012 22:44:45 +0200 Subject: [PATCH] Revert usb-quiesce since it's wrong. * grub-core/disk/ieee1275/ofdisk.c (quiesce): Removed. (grub_ofdisk_init): Don't do quiesce. --- ChangeLog | 7 +++++++ grub-core/disk/ieee1275/ofdisk.c | 31 ------------------------------- 2 files changed, 7 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 55151bf8e..fe284e46b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-06-13 Vladimir Serbinenko + + Revert usb-quiesce since it's wrong. + + * grub-core/disk/ieee1275/ofdisk.c (quiesce): Removed. + (grub_ofdisk_init): Don't do quiesce. + 2012-06-13 Vladimir Serbinenko * grub-core/kern/ieee1275/cmain.c (grub_ieee1275_find_options): Apply diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c index b1b2bff24..8a7c639be 100644 --- a/grub-core/disk/ieee1275/ofdisk.c +++ b/grub-core/disk/ieee1275/ofdisk.c @@ -476,34 +476,6 @@ grub_ofdisk_init (void) grub_disk_dev_register (&grub_ofdisk_dev); } -static int quiesce (struct grub_ieee1275_devalias *alias) -{ - static grub_ieee1275_ihandle_t ihandle; - struct set_color_args - { - struct grub_ieee1275_common_hdr common; - grub_ieee1275_cell_t method; - grub_ieee1275_cell_t ihandle; - grub_ieee1275_cell_t catch_result; - } - args; - - if (grub_strcmp (alias->type, "usb") != 0) - return 0; - - - if (grub_ieee1275_open (alias->path, &ihandle)) - return 0; - - INIT_IEEE1275_COMMON (&args.common, "call-method", 2, 1); - args.method = (grub_ieee1275_cell_t) "usb-quiesce"; - args.ihandle = ihandle; - - IEEE1275_CALL_ENTRY_FN (&args); - grub_ieee1275_close (ihandle); - return 0; -} - void grub_ofdisk_fini (void) { @@ -512,8 +484,5 @@ grub_ofdisk_fini (void) last_ihandle = 0; last_devpath = NULL; - grub_ieee1275_devices_iterate (quiesce); - grub_millisleep (10); - grub_disk_dev_unregister (&grub_ofdisk_dev); }