mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jeff Garzik <jeff@garzik.org>
To: linux-kernel@vger.kernel.org, isdn4linux@listserv.isdn4linux.de
Cc: kkeil@suse.de, akpm@linux-foundation.org
Subject: [PATCH 15/16] [ISDN] HiSax diva: ia32 build fixes
Date: Mon, 29 Oct 2007 15:39:17 -0400 (EDT)	[thread overview]
Message-ID: <784ed61cab877a62421ce5287ecebfa6cbcdc0e4.1193686445.git.jeff@garzik.org> (raw)
In-Reply-To: <eb2aa159d7f722c61d637feb287bc0f2f9519b1d.1193686445.git.jeff@garzik.org>

---
 drivers/isdn/hisax/diva.c |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index 33aacd0..4fd5440 100644
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -24,7 +24,8 @@
 #include "ipacx.h"
 #include "isdnl1.h"
 #include <linux/pci.h>
-#include <linux/isapnp.h>
+#include <linux/isa.h>
+#include <linux/pnp.h>
 
 static int diva_protocol;		/* 0 == use DEFAULT_PROTO */
 
@@ -1088,10 +1089,10 @@ static int __devinit diva_pnp_setup(struct IsdnCard *card)
 {
 	struct IsdnCardState *cs = card->cs;
 	struct pnp_dev *pnp_d = (void *) card->para[0];
+	int ipid_function = card->para[1];
 	int err;
 
-	printk(KERN_INFO "HiSax: %s detected\n",
-		(char *)ipid->driver_data);
+	printk(KERN_INFO "HiSax: DIVA PNP detected\n");
 	pnp_disable_dev(pnp_d);
 	err = pnp_activate_dev(pnp_d);
 	if (err<0) {
@@ -1109,7 +1110,7 @@ static int __devinit diva_pnp_setup(struct IsdnCard *card)
 	}
 	cs->hw.diva.cfg_reg  = card->para[1];
 	cs->irq = card->para[0];
-	if (ipid->function == ISAPNP_FUNCTION(0xA1)) {
+	if (ipid_function == 0xA1) {
 		cs->subtyp = DIVA_IPAC_ISA;
 		cs->hw.diva.ctrl = 0;
 		cs->hw.diva.isac =
@@ -1145,6 +1146,7 @@ static int __devinit diva_pnp_init_one(struct pnp_dev *pdev,
 	int cardnr;
 
 	icard.para[0] = (unsigned long) pdev;
+	icard.para[1] = dev_id->driver_data;
 	if (!diva_protocol)
 		icard.protocol = DEFAULT_PROTO;
 	else
@@ -1166,12 +1168,12 @@ static void __devexit diva_pnp_remove_one(struct pnp_dev *pdev)
 }
 
 static struct pnp_device_id diva_pnp_table[] = {
-	{ .id = "GDI0051", },
-	{ .id = "GDI0071", },
-	{ .id = "GDI00A1", },
-	{ .id = "EIC0051", },
-	{ .id = "EIC0071", },
-	{ .id = "EIC00A1", },
+	{ .id = "GDI0051", 0 },
+	{ .id = "GDI0071", 0 },
+	{ .id = "GDI00A1", 0xA1 },
+	{ .id = "EIC0051", 0 },
+	{ .id = "EIC0071", 0 },
+	{ .id = "EIC00A1", 0xA1 },
 
 	{ .id = "" }		/* terminate list */
 };
-- 
1.5.2.4


  parent reply	other threads:[~2007-10-29 19:44 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-29 19:38 [PATCH 00/16] [ISDN] HiSax: modularize card setup Jeff Garzik
2007-10-29 19:38 ` [PATCH 01/16] " Jeff Garzik
2007-10-29 19:38 ` [PATCH 02/16] [ISDN] Ready HiSax driver for modularization Jeff Garzik
2007-10-29 19:38 ` [PATCH 03/16] [ISDN] HiSax bkm_a4t: convert to PCI hotplug API Jeff Garzik
2007-10-29 19:39 ` [PATCH 04/16] [ISDN] HiSax enternow: " Jeff Garzik
2007-10-29 19:39 ` [PATCH 05/16] [ISDN] HiSax hfc_pci, w6692: " Jeff Garzik
2007-10-29 19:39 ` [PATCH 06/16] [ISDN] HiSax nj_s, nj_u: " Jeff Garzik
2007-10-29 19:39 ` [PATCH 07/16] [ISDN] HiSax telespci: " Jeff Garzik
2007-10-29 19:39 ` [PATCH 08/16] [ISDN] HiSax: additional export to make things proper Jeff Garzik
2007-10-29 19:39 ` [PATCH 09/16] [ISDN] HiSax avm_pci: convert to modern probing Jeff Garzik
2007-10-29 19:39 ` [PATCH 10/16] [ISDN] HiSax acm_pci: fix module unload Jeff Garzik
2007-10-29 19:39 ` [PATCH 11/16] [ISDN] HiSax gazel: convert to ISA/PCI new probing Jeff Garzik
2007-10-29 19:39 ` [PATCH 12/16] [ISDN] HiSax gazel: ifdef bug fixes for x86-64 Jeff Garzik
2007-10-29 19:39 ` [PATCH 13/16] [ISDN] HiSax niccy: convert to ISA/PNP/PCI new style probing Jeff Garzik
2007-10-29 19:39 ` [PATCH 14/16] [ISDN] HiSax diva: convert to PCI/PNP/ISA new-style APIs Jeff Garzik
2007-10-29 19:39 ` Jeff Garzik [this message]
2007-10-29 19:39 ` [PATCH 16/16] [ISDN] HiSax bkm_a8: convert to PCI hotplug API Jeff Garzik

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=784ed61cab877a62421ce5287ecebfa6cbcdc0e4.1193686445.git.jeff@garzik.org \
    --to=jeff@garzik.org \
    --cc=akpm@linux-foundation.org \
    --cc=isdn4linux@listserv.isdn4linux.de \
    --cc=kkeil@suse.de \
    --cc=linux-kernel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®