LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jeff Garzik <jeff@garzik.org>
To: kkeil@suse.de, isdn4linux@listserv.isdn4linux.de,
	linux-kernel@vger.kernel.org
Subject: [PATCH 01/14] [ISDN] HiSax: modularization prep
Date: Fri, 15 Feb 2008 23:41:15 -0500	[thread overview]
Message-ID: <167d76873c13943668c7f4443bfa60bb1552ecb2.1203189978.git.jeff@garzik.org> (raw)
In-Reply-To: <098123kjff90231nv098233rnvd908u234@garzik.org>

Pass a function pointer into the core HiSax probe function checkcard(),
in order to facilitate modular drivers passing in their own setup
routines.

Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---
 drivers/isdn/hisax/config.c    |   14 +++++++++-----
 drivers/isdn/hisax/hisax_cfg.h |    2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index a0ee43c..84d75a3 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -1169,7 +1169,9 @@ outf_cs:
 /* Used from an exported function but calls __devinit functions.
  * Tell modpost not to warn (__ref)
  */
-static int __ref checkcard(int cardnr, char *id, int *busy_flag, struct module *lockowner)
+static int __ref checkcard(int cardnr, char *id, int *busy_flag,
+			   struct module *lockowner,
+			   hisax_setup_func_t card_setup)
 {
 	int ret;
 	struct IsdnCard *card = cards + cardnr;
@@ -1187,7 +1189,7 @@ static int __ref checkcard(int cardnr, char *id, int *busy_flag, struct module *
 	       (card->protocol == ISDN_PTYPE_NI1) ? "NI1" :
 	       "NONE", cs->iif.id, cs->myid);
 
-	ret = hisax_cs_setup_card(card);
+	ret = card_setup(card);
 	if (!ret) {
 		ll_unload(cs);
 		goto outf_cs;
@@ -1241,7 +1243,8 @@ static int HiSax_inithardware(int *busy_flag)
 			else
 				sprintf(ids, "%s%d", id, i);
 		}
-		if (checkcard(i, ids, busy_flag, THIS_MODULE)) {
+		if (checkcard(i, ids, busy_flag, THIS_MODULE,
+			      hisax_cs_setup_card)) {
 			foundcards++;
 			i++;
 		} else {
@@ -1549,7 +1552,8 @@ int hisax_init_pcmcia(void *pcm_iob, int *busy_flag, struct IsdnCard *card)
 		sprintf(ids, "HiSax%d", nrcards);
 	else
 		sprintf(ids, "HiSax");
-	if (!checkcard(nrcards, ids, busy_flag, THIS_MODULE))
+	if (!checkcard(nrcards, ids, busy_flag, THIS_MODULE,
+		       hisax_cs_setup_card))
 		goto error;
 
 	ret = nrcards;
@@ -1595,7 +1599,7 @@ int hisax_register(struct hisax_d_if *hisax_d_if, struct hisax_b_if *b_if[],
 	cards[i].protocol = protocol;
 	sprintf(id, "%s%d", name, i);
 	nrcards++;
-	retval = checkcard(i, id, NULL, hisax_d_if->owner);
+	retval = checkcard(i, id, NULL, hisax_d_if->owner, hisax_cs_setup_card);
 	if (retval == 0) { // yuck
 		cards[i].typ = 0;
 		nrcards--;
diff --git a/drivers/isdn/hisax/hisax_cfg.h b/drivers/isdn/hisax/hisax_cfg.h
index ca3fe62..17a2fea 100644
--- a/drivers/isdn/hisax/hisax_cfg.h
+++ b/drivers/isdn/hisax/hisax_cfg.h
@@ -60,5 +60,7 @@ struct IsdnCard {
 	IsdnCardState_t	*cs;
 };
 
+typedef int (*hisax_setup_func_t)(struct IsdnCard *card);
+
 extern void	HiSax_closecard(int);
 extern int	hisax_init_pcmcia(void *, int *, IsdnCard_t *);
-- 
1.5.3.8


  reply	other threads:[~2008-02-16 20:29 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-16  4:41 [PATCH 00/14] [ISDN] convert HiSax to hotplug APIs Jeff Garzik
2008-02-16  4:41 ` Jeff Garzik [this message]
2007-07-18  3:46   ` [PATCH 04/14] [ISDN] HiSax bkm_a4t: convert to PCI hotplug API Jeff Garzik
2007-07-18  3:49   ` [PATCH 05/14] [ISDN] HiSax enternow: " Jeff Garzik
2007-07-18  3:54   ` [PATCH 06/14] [ISDN] HiSax hfc_pci, w6692: " Jeff Garzik
2007-07-18  3:59   ` [PATCH 07/14] [ISDN] HiSax nj_s, nj_u: " Jeff Garzik
2007-07-18  4:02   ` [PATCH 08/14] [ISDN] HiSax telespci: " Jeff Garzik
2007-07-24 12:26   ` [PATCH 11/14] [ISDN] HiSax niccy: convert to modern ISA/PNP/PCI probing Jeff Garzik
2007-08-02 12:37   ` [PATCH 14/14] [ISDN] HiSax bkm_a8: convert to PCI hotplug API Jeff Garzik
2007-10-31  5:10   ` [PATCH 03/14] [ISDN] Ready HiSax driver for modularization Jeff Garzik
2007-10-31  5:11   ` [PATCH 09/14] [ISDN] HiSax avm_pci: convert to modern PCI/ISA/PNP probing Jeff Garzik
2007-10-31  5:12   ` [PATCH 10/14] [ISDN] HiSax gazel: convert to modern ISA/PCI probing Jeff Garzik
2007-10-31  5:13   ` [PATCH 13/14] [ISDN] HiSax diva: convert to modern ISA/PNP/PCI probing Jeff Garzik
2007-10-31  7:42   ` [PATCH 02/14] [ISDN] Hisax: eliminate many unnecessary references to CardType[] Jeff Garzik
2008-02-16 19:17   ` [PATCH 12/14] [ISDN] HiSax avm_pci, niccy: minor PNP fixes and cleanups Jeff Garzik
2008-02-17 19:52 ` Plans for mISDN? Was: [PATCH 00/14] [ISDN] Sam Ravnborg
2008-02-18  4:52   ` Greg KH
2008-02-18 12:08     ` Andi Kleen
2008-02-18 12:04       ` Alan Cox
2008-02-18 12:36       ` Jeff Garzik
2008-02-18 13:29         ` Andi Kleen
2008-02-19  8:50       ` Sam Ravnborg
2008-02-19  9:25         ` Gregory Nietsky
2008-02-19  9:54           ` Sam Ravnborg
2008-02-20 14:19           ` Tilman Schmidt
2008-02-20 14:23             ` Alan Cox
2008-02-20 16:54             ` Andi Kleen
2008-02-20 18:23               ` Plans for mISDN? Tilman Schmidt
2008-02-20 19:04               ` Plans for mISDN? Was: [PATCH 00/14] [ISDN] Gregory Nietsky
2008-02-20 22:47                 ` Plans for mISDN? Tilman Schmidt
2008-02-21 10:33             ` Plans for mISDN? Was: [PATCH 00/14] [ISDN] Simon Richter
2008-02-21 19:38               ` Gregory Nietsky
2008-02-21 19:46               ` Marcel Holtmann
2008-02-21 23:19                 ` Andi Kleen
2008-02-21 23:30                   ` Marcel Holtmann
2008-02-21 23:40                     ` Andi Kleen
2008-02-22 12:04               ` Karsten Keil
2008-02-23 19:39                 ` Sam Ravnborg
2008-02-25 14:39                 ` Plans for mISDN? Tilman Schmidt
2008-03-03 17:32                   ` Karsten Keil
2008-02-19  9:40         ` Plans for mISDN? Was: [PATCH 00/14] [ISDN] Andi Kleen
2008-02-19  9:56           ` Sam Ravnborg
2008-02-19  9:58             ` Andi Kleen
2008-02-19 10:51               ` Armin Schindler
2008-02-19 11:55               ` Sam Ravnborg
2008-02-19 16:12                 ` Gregory Nietsky
2008-02-19 16:14               ` Marcel Holtmann
2008-02-20 14:24                 ` Tilman Schmidt

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=167d76873c13943668c7f4443bfa60bb1552ecb2.1203189978.git.jeff@garzik.org \
    --to=jeff@garzik.org \
    --cc=isdn4linux@listserv.isdn4linux.de \
    --cc=kkeil@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --subject='Re: [PATCH 01/14] [ISDN] HiSax: modularization prep' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).