From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael Chan" Subject: [PATCH 3/6] bnx2: Fix excessive udelay Date: Mon, 23 May 2005 17:27:43 -0700 Message-ID: <1116894463.4908.30.camel@rh4> References: <1116892439.4908.1.camel@rh4> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-4hS86m+LI1RxJ2a9xzMz" Cc: jgarzik@pobox.com, netdev@oss.sgi.com Return-path: To: davem@davemloft.net In-Reply-To: <1116892439.4908.1.camel@rh4> Sender: netdev-bounce@oss.sgi.com Errors-to: netdev-bounce@oss.sgi.com List-Id: netdev.vger.kernel.org --=-4hS86m+LI1RxJ2a9xzMz Content-Type: text/plain Content-Transfer-Encoding: 7bit Replaced one excessive udelay of 15msec with msleep since the calling context is always process. Also replaced some schedule_timeout calls with msleep/msleep_interruptible. Spotted by Jeff Garzik. Signed-off-by: Michael Chan --=-4hS86m+LI1RxJ2a9xzMz Content-Disposition: attachment; filename=bnx2-13.patch Content-Type: text/x-patch; charset=utf-8; name=bnx2-13.patch Content-Transfer-Encoding: base64 ZGlmZiAtTnJ1IDEyL2RyaXZlcnMvbmV0L2JueDIuYyAxMy9kcml2ZXJzL25ldC9ibngyLmMNCi0t LSAxMi9kcml2ZXJzL25ldC9ibngyLmMJMjAwNS0wNS0yMyAxMDoyOTowMi4wMDAwMDAwMDAgLTA3 MDANCisrKyAxMy9kcml2ZXJzL25ldC9ibngyLmMJMjAwNS0wNS0yMyAxMDo1Nzo0MS4wMDAwMDAw MDAgLTA3MDANCkBAIC0yMDExLDExICsyMDExLDkgQEANCiAJCQkocG1jc3IgJiB+UENJX1BNX0NU UkxfU1RBVEVfTUFTSykgfA0KIAkJCVBDSV9QTV9DVFJMX1BNRV9TVEFUVVMpOw0KIA0KLQkJaWYg KHBtY3NyICYgUENJX1BNX0NUUkxfU1RBVEVfTUFTSykgew0KKwkJaWYgKHBtY3NyICYgUENJX1BN X0NUUkxfU1RBVEVfTUFTSykNCiAJCQkvKiBkZWxheSByZXF1aXJlZCBkdXJpbmcgdHJhbnNpdGlv biBvdXQgb2YgRDNob3QgKi8NCi0JCQljdXJyZW50LT5zdGF0ZSA9IFRBU0tfVU5JTlRFUlJVUFRJ QkxFOw0KLQkJCXNjaGVkdWxlX3RpbWVvdXQoSFogLyA1MCk7DQotCQl9DQorCQkJbXNsZWVwKDIw KTsNCiANCiAJCXZhbCA9IFJFR19SRChicCwgQk5YMl9FTUFDX01PREUpOw0KIAkJdmFsIHw9IEJO WDJfRU1BQ19NT0RFX01QS1RfUkNWRCB8IEJOWDJfRU1BQ19NT0RFX0FDUElfUkNWRDsNCkBAIC0y NzUxLDEyICsyNzQ5LDggQEANCiAJUkVHX1dSKGJwLCBCTlgyX1BDSUNGR19NSVNDX0NPTkZJRywg dmFsKTsNCiANCiAJaWYgKChDSElQX0lEKGJwKSA9PSBDSElQX0lEXzU3MDZfQTApIHx8DQotCSAg ICAoQ0hJUF9JRChicCkgPT0gQ0hJUF9JRF81NzA2X0ExKSkgew0KLQ0KLQkgICAgICAgIGZvciAo aSA9IDA7IGkgPCA1MDA7IGkrKykgew0KLQkJCXVkZWxheSgzMCk7DQotCQl9DQotCX0NCisJICAg IChDSElQX0lEKGJwKSA9PSBDSElQX0lEXzU3MDZfQTEpKQ0KKwkJbXNsZWVwKDE1KTsNCiANCiAJ LyogUmVzZXQgdGFrZXMgYXBwcm94aW1hdGUgMzAgdXNlYyAqLw0KIAlmb3IgKGkgPSAwOyBpIDwg MTA7IGkrKykgew0KQEAgLTM3ODUsOCArMzc3OSw2IEBADQogCVJFR19XUihicCwgQk5YMl9IQ19D T01NQU5ELCB2YWwgfCBCTlgyX0hDX0NPTU1BTkRfQ09BTF9OT1cpOw0KIAlSRUdfUkQoYnAsIEJO WDJfSENfQ09NTUFORCk7DQogDQotCXVkZWxheSg4MCk7DQotDQogCWZvciAoaSA9IDA7IGkgPCAx MDsgaSsrKSB7DQogCQlpZiAoKFJFR19SRChicCwgQk5YMl9QQ0lDRkdfSU5UX0FDS19DTUQpICYg MHhmZmZmKSAhPQ0KIAkJCXN0YXR1c19pZHgpIHsNCkBAIC0zNzk0LDggKzM3ODYsNyBAQA0KIAkJ CWJyZWFrOw0KIAkJfQ0KIA0KLQkJY3VycmVudC0+c3RhdGUgPSBUQVNLX0lOVEVSUlVQVElCTEU7 DQotCQlzY2hlZHVsZV90aW1lb3V0KDEpOw0KKwkJbXNsZWVwX2ludGVycnVwdGlibGUoMTApOw0K IAl9DQogCWlmIChpIDwgMTApDQogCQlyZXR1cm4gMDsNCkBAIC00NDc4LDggKzQ0NjksNyBAQA0K IAkJYm54Ml93cml0ZV9waHkoYnAsIE1JSV9CTUNSLCBCTUNSX0xPT1BCQUNLKTsNCiAJCXNwaW5f dW5sb2NrX2lycSgmYnAtPnBoeV9sb2NrKTsNCiANCi0JCWN1cnJlbnQtPnN0YXRlID0gVEFTS19V TklOVEVSUlVQVElCTEU7DQotCQlzY2hlZHVsZV90aW1lb3V0KEhaIC8gNTApOw0KKwkJbXNsZWVw KDIwKTsNCiANCiAJCXNwaW5fbG9ja19pcnEoJmJwLT5waHlfbG9jayk7DQogCQlpZiAoQ0hJUF9O VU0oYnApID09IENISVBfTlVNXzU3MDYpIHsNCkBAIC00ODY5LDEyICs0ODU5LDkgQEANCiAJCX0N CiANCiAJCS8qIHdhaXQgZm9yIGxpbmsgdXAgKi8NCi0JCWN1cnJlbnQtPnN0YXRlID0gVEFTS19J TlRFUlJVUFRJQkxFOw0KLQkJc2NoZWR1bGVfdGltZW91dCgzICogSFopOw0KLQkJaWYgKCghYnAt PmxpbmtfdXApICYmICEoYnAtPnBoeV9mbGFncyAmIFBIWV9TRVJERVNfRkxBRykpIHsNCi0JCQlj dXJyZW50LT5zdGF0ZSA9IFRBU0tfSU5URVJSVVBUSUJMRTsNCi0JCQlzY2hlZHVsZV90aW1lb3V0 KDQgKiBIWik7DQotCQl9DQorCQltc2xlZXBfaW50ZXJydXB0aWJsZSgzMDAwKTsNCisJCWlmICgo IWJwLT5saW5rX3VwKSAmJiAhKGJwLT5waHlfZmxhZ3MgJiBQSFlfU0VSREVTX0ZMQUcpKQ0KKwkJ CW1zbGVlcF9pbnRlcnJ1cHRpYmxlKDQwMDApOw0KIAl9DQogDQogCWlmIChibngyX3Rlc3RfbnZy YW0oYnApICE9IDApIHsNCkBAIC00OTc1LDggKzQ5NjIsNyBAQA0KIAkJCQlCTlgyX0VNQUNfTEVE X1RSQUZGSUNfT1ZFUlJJREUgfA0KIAkJCQlCTlgyX0VNQUNfTEVEX1RSQUZGSUMpOw0KIAkJfQ0K LQkJY3VycmVudC0+c3RhdGUgPSBUQVNLX0lOVEVSUlVQVElCTEU7DQotCQlzY2hlZHVsZV90aW1l b3V0KEhaIC8gMik7DQorCQltc2xlZXBfaW50ZXJydXB0aWJsZSg1MDApOw0KIAkJaWYgKHNpZ25h bF9wZW5kaW5nKGN1cnJlbnQpKQ0KIAkJCWJyZWFrOw0KIAl9DQo= --=-4hS86m+LI1RxJ2a9xzMz--