From: Christoph Hellwig <hch@lst.de>
To: Emoore@lsil.com
Cc: linux-scsi@vger.kernel.org
Subject: [PATCH] kill FusionInitCalled
Date: Sat, 2 Oct 2004 10:11:48 +0200 [thread overview]
Message-ID: <20041002081148.GA13609@lst.de> (raw)
the scsi early init problem is long gone, so no need to work around it
anymore.
--- 1.33/drivers/message/fusion/mptbase.c 2004-09-29 04:47:31 +02:00
+++ edited/drivers/message/fusion/mptbase.c 2004-10-01 12:02:37 +02:00
@@ -155,7 +155,6 @@
static MPT_RESETHANDLER MptResetHandlers[MPT_MAX_PROTOCOL_DRIVERS];
static struct mpt_pci_driver *MptDeviceDriverHandlers[MPT_MAX_PROTOCOL_DRIVERS];
-static int FusionInitCalled = 0;
static int mpt_base_index = -1;
static int last_drv_idx = -1;
@@ -603,22 +602,6 @@
last_drv_idx = -1;
-#ifndef MODULE
- /*
- * Handle possibility of the mptscsih_detect() routine getting
- * called *before* fusion_init!
- */
- if (!FusionInitCalled) {
- dprintk((KERN_INFO MYNAM ": Hmmm, calling fusion_init from mpt_register!\n"));
- /*
- * NOTE! We'll get recursion here, as fusion_init()
- * calls mpt_register()!
- */
- fusion_init();
- FusionInitCalled++;
- }
-#endif
-
/*
* Search for empty callback slot in this order: {N,...,7,6,5,...,1}
* (slot/handle 0 is reserved!)
@@ -5933,11 +5916,6 @@
{
int i;
int r;
-
- if (FusionInitCalled++) {
- dprintk((KERN_INFO MYNAM ": INFO - Driver late-init entry point called\n"));
- return 0;
- }
show_mptmod_ver(my_NAME, my_VERSION);
printk(KERN_INFO COPYRIGHT "\n");
===== drivers/message/fusion/mptscsih.c 1.50 vs edited =====
next reply other threads:[~2004-10-02 8:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-10-02 8:11 Christoph Hellwig [this message]
2004-10-21 9:21 ` [PATCH] kill FusionInitCalled Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041002081148.GA13609@lst.de \
--to=hch@lst.de \
--cc=Emoore@lsil.com \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.