From: Andrey Panin <pazke@donpac.ru>
To: Kyle Moffett <mrmacman_g4@mac.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Russell King <rmk+serial@arm.linux.org.uk>
Subject: Re: [PATCH] [2.6] Clean up useless 8250 siig functions and header
Date: Fri, 14 Jan 2005 15:01:01 +0300 [thread overview]
Message-ID: <20050114120101.GA29859@pazke> (raw)
In-Reply-To: <71216E5F-5F6C-11D9-B39F-000393ACC76E@mac.com>
[-- Attachment #1.1: Type: text/plain, Size: 578 bytes --]
On 005, 01 05, 2005 at 05:52:14PM -0500, Kyle Moffett wrote:
> This removes two simple siig functions that should just be integrated
> into the calling code.
Good idea, wrong patch. You deleted wrapper code, but actual init
functions left not exported for use by parport_serial module.
Even worse, they are left static, so monilithic kernel build will
not work too :/
Did you compiled the kernel with your patch applied ?
Please use attached patch instead.
--
Andrey Panin | Linux and UNIX system administrator
pazke@donpac.ru | PGP key: wwwkeys.pgp.net
[-- Attachment #1.2: patch-siig-cleanup --]
[-- Type: text/plain, Size: 2987 bytes --]
diff -urdpNX /usr/share/dontdiff linux-2.6.11-rc1.vanilla/drivers/parport/parport_serial.c linux-2.6.11-rc1/drivers/parport/parport_serial.c
--- linux-2.6.11-rc1.vanilla/drivers/parport/parport_serial.c 2004-12-25 00:35:28.000000000 +0300
+++ linux-2.6.11-rc1/drivers/parport/parport_serial.c 2005-01-14 10:38:53.000000000 +0300
@@ -159,12 +159,12 @@ struct pci_board_no_ids {
static int __devinit siig10x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable)
{
- return pci_siig10x_fn(dev, enable);
+ return enable ? pci_siig10x_init(dev) : 0;
}
static int __devinit siig20x_init_fn(struct pci_dev *dev, struct pci_board_no_ids *board, int enable)
{
- return pci_siig20x_fn(dev, enable);
+ return enable ? pci_siig20x_init(dev) : 0;
}
static struct pci_board_no_ids pci_boards[] __devinitdata = {
diff -urdpNX /usr/share/dontdiff linux-2.6.11-rc1.vanilla/drivers/serial/8250_pci.c linux-2.6.11-rc1/drivers/serial/8250_pci.c
--- linux-2.6.11-rc1.vanilla/drivers/serial/8250_pci.c 2004-12-25 00:35:23.000000000 +0300
+++ linux-2.6.11-rc1/drivers/serial/8250_pci.c 2005-01-14 10:57:26.000000000 +0300
@@ -393,7 +392,7 @@ static void __devexit sbs_exit(struct pc
#define PCI_DEVICE_ID_SIIG_1S_10x (PCI_DEVICE_ID_SIIG_1S_10x_550 & 0xfffc)
#define PCI_DEVICE_ID_SIIG_2S_10x (PCI_DEVICE_ID_SIIG_2S_10x_550 & 0xfff8)
-static int pci_siig10x_init(struct pci_dev *dev)
+int pci_siig10x_init(struct pci_dev *dev)
{
u16 data;
void __iomem *p;
@@ -419,11 +418,12 @@ static int pci_siig10x_init(struct pci_d
iounmap(p);
return 0;
}
+EXPORT_SYMBOL(pci_siig10x_init);
#define PCI_DEVICE_ID_SIIG_2S_20x (PCI_DEVICE_ID_SIIG_2S_20x_550 & 0xfffc)
#define PCI_DEVICE_ID_SIIG_2S1P_20x (PCI_DEVICE_ID_SIIG_2S1P_20x_550 & 0xfffc)
-static int pci_siig20x_init(struct pci_dev *dev)
+int pci_siig20x_init(struct pci_dev *dev)
{
u8 data;
@@ -439,25 +439,7 @@ static int pci_siig20x_init(struct pci_d
}
return 0;
}
-
-int pci_siig10x_fn(struct pci_dev *dev, int enable)
-{
- int ret = 0;
- if (enable)
- ret = pci_siig10x_init(dev);
- return ret;
-}
-
-int pci_siig20x_fn(struct pci_dev *dev, int enable)
-{
- int ret = 0;
- if (enable)
- ret = pci_siig20x_init(dev);
- return ret;
-}
-
-EXPORT_SYMBOL(pci_siig10x_fn);
-EXPORT_SYMBOL(pci_siig20x_fn);
+EXPORT_SYMBOL(pci_siig20x_init);
/*
* Timedia has an explosion of boards, and to avoid the PCI table from
diff -urdpNX /usr/share/dontdiff linux-2.6.11-rc1.vanilla/include/linux/8250_pci.h linux-2.6.11-rc1/include/linux/8250_pci.h
--- linux-2.6.11-rc1.vanilla/include/linux/8250_pci.h 2004-12-25 00:35:25.000000000 +0300
+++ linux-2.6.11-rc1/include/linux/8250_pci.h 2005-01-14 10:57:42.000000000 +0300
@@ -1,2 +1,2 @@
-int pci_siig10x_fn(struct pci_dev *dev, int enable);
-int pci_siig20x_fn(struct pci_dev *dev, int enable);
+int pci_siig10x_init(struct pci_dev *dev);
+int pci_siig20x_init(struct pci_dev *dev);
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2005-01-14 12:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-01-05 22:52 [PATCH] [2.6] Clean up useless 8250 siig functions and header Kyle Moffett
2005-01-14 12:01 ` Andrey Panin [this message]
2005-01-14 12:22 ` Kyle Moffett
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=20050114120101.GA29859@pazke \
--to=pazke@donpac.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=mrmacman_g4@mac.com \
--cc=rmk+serial@arm.linux.org.uk \
/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.