From: Andrey Panin <pazke@donpac.ru>
To: linux-kernel@vger.kernel.org
Subject: [PATCH] remove SIIG combo cards PCI ids from parport_pc
Date: Thu, 22 Jan 2004 15:11:31 +0300 [thread overview]
Message-ID: <20040122121131.GH5045@pazke> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 353 bytes --]
Hi all,
support for SIIG made serial/parallel conbo cards was moved
to parport_serial driver some months ago, but their PCI ids
still remain in parport_pc PCI device table.
Attached patch (2.6.1) removes them. Please apply.
Best regards.
--
Andrey Panin | Linux and UNIX system administrator
pazke@donpac.ru | PGP key: wwwkeys.pgp.net
[-- Attachment #1.2: patch-siig-combo-parport-remove-2.6 --]
[-- Type: text/plain, Size: 4563 bytes --]
diff -urN -X /usr/share/dontdiff linux-2.6.0-test11.vanilla/drivers/parport/parport_pc.c linux-2.6.0-test11/drivers/parport/parport_pc.c
--- linux-2.6.0-test11.vanilla/drivers/parport/parport_pc.c 2003-12-05 01:43:22.000000000 +0300
+++ linux-2.6.0-test11/drivers/parport/parport_pc.c 2003-12-05 01:34:02.000000000 +0300
@@ -2686,25 +2686,10 @@
enum parport_pc_pci_cards {
- siig_1s1p_10x_550 = last_sio,
- siig_1s1p_10x_650,
- siig_1s1p_10x_850,
- siig_1p_10x,
+ siig_1p_10x = last_sio,
siig_2p_10x,
- siig_2s1p_10x_550,
- siig_2s1p_10x_650,
- siig_2s1p_10x_850,
siig_1p_20x,
siig_2p_20x,
- siig_2p1s_20x_550,
- siig_2p1s_20x_650,
- siig_2p1s_20x_850,
- siig_1s1p_20x_550,
- siig_1s1p_20x_650,
- siig_1s1p_20x_850,
- siig_2s1p_20x_550,
- siig_2s1p_20x_650,
- siig_2s1p_20x_850,
lava_parallel,
lava_parallel_dual_a,
lava_parallel_dual_b,
@@ -2766,25 +2751,10 @@
* is non-zero we couldn't use any of the ports. */
void (*postinit_hook) (struct pci_dev *pdev, int failed);
} cards[] __devinitdata = {
- /* siig_1s1p_10x_550 */ { 1, { { 3, 4 }, } },
- /* siig_1s1p_10x_650 */ { 1, { { 3, 4 }, } },
- /* siig_1s1p_10x_850 */ { 1, { { 3, 4 }, } },
/* siig_1p_10x */ { 1, { { 2, 3 }, } },
/* siig_2p_10x */ { 2, { { 2, 3 }, { 4, 5 }, } },
- /* siig_2s1p_10x_550 */ { 1, { { 4, 5 }, } },
- /* siig_2s1p_10x_650 */ { 1, { { 4, 5 }, } },
- /* siig_2s1p_10x_850 */ { 1, { { 4, 5 }, } },
/* siig_1p_20x */ { 1, { { 0, 1 }, } },
/* siig_2p_20x */ { 2, { { 0, 1 }, { 2, 3 }, } },
- /* siig_2p1s_20x_550 */ { 2, { { 1, 2 }, { 3, 4 }, } },
- /* siig_2p1s_20x_650 */ { 2, { { 1, 2 }, { 3, 4 }, } },
- /* siig_2p1s_20x_850 */ { 2, { { 1, 2 }, { 3, 4 }, } },
- /* siig_1s1p_20x_550 */ { 1, { { 1, 2 }, } },
- /* siig_1s1p_20x_650 */ { 1, { { 1, 2 }, } },
- /* siig_1s1p_20x_850 */ { 1, { { 1, 2 }, } },
- /* siig_2s1p_20x_550 */ { 1, { { 2, 3 }, } },
- /* siig_2s1p_20x_650 */ { 1, { { 2, 3 }, } },
- /* siig_2s1p_20x_850 */ { 1, { { 2, 3 }, } },
/* lava_parallel */ { 1, { { 0, -1 }, } },
/* lava_parallel_dual_a */ { 1, { { 0, -1 }, } },
/* lava_parallel_dual_b */ { 1, { { 0, -1 }, } },
@@ -2836,44 +2806,14 @@
PCI_ANY_ID, PCI_ANY_ID, 0, 0, sio_ite_8872 },
/* PCI cards */
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x_550 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x_650 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_850,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x_850 },
{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1P_10x,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1p_10x },
{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P_10x,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p_10x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x_550 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x_650 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_850,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x_850 },
{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1P_20x,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1p_20x },
{ PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P_20x,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p_20x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x_550 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x_650 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_850,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x_850 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x_550 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x_650 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_850,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x_850 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x_550 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x_650 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_850,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x_850 },
{ PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_PARALLEL,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, lava_parallel },
{ PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_DUAL_PAR_A,
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
reply other threads:[~2004-01-22 12:11 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20040122121131.GH5045@pazke \
--to=pazke@donpac.ru \
--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