LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH]: Fix __devinit & __devexit declarations in de2104x driver
@ 2007-02-26 18:36 Prarit Bhargava
2007-02-27 9:22 ` Jeff Garzik
0 siblings, 1 reply; 4+ messages in thread
From: Prarit Bhargava @ 2007-02-26 18:36 UTC (permalink / raw)
To: linux-kernel, akpm, jgarzik; +Cc: Prarit Bhargava
Resending (originally sent 2007-02-14).
__devinit & __devexit cleanups for de2104x driver.
Fixes MODPOST warnings similar to:
WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to
.init.text:de_init_one from .data.rel.local after 'de_driver' (at offset 0x20)
WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to
.exit.text:de_remove_one from .data.rel.local after 'de_driver' (at offset 0x28)
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
--- linux-2.6.18.ia64.orig/drivers/net/tulip/de2104x.c 2006-09-19 23:42:06.000000000 -0400
+++ linux-2.6.18.ia64/drivers/net/tulip/de2104x.c 2007-02-14 13:43:55.000000000 -0500
@@ -1685,7 +1685,7 @@ static struct ethtool_ops de_ethtool_ops
.get_regs = de_get_regs,
};
-static void __init de21040_get_mac_address (struct de_private *de)
+static void __devinit de21040_get_mac_address (struct de_private *de)
{
unsigned i;
@@ -1703,7 +1703,7 @@ static void __init de21040_get_mac_addre
}
}
-static void __init de21040_get_media_info(struct de_private *de)
+static void __devinit de21040_get_media_info(struct de_private *de)
{
unsigned int i;
@@ -1730,7 +1730,7 @@ static void __init de21040_get_media_inf
}
/* Note: this routine returns extra data bits for size detection. */
-static unsigned __init tulip_read_eeprom(void __iomem *regs, int location, int addr_len)
+static unsigned __devinit tulip_read_eeprom(void __iomem *regs, int location, int addr_len)
{
int i;
unsigned retval = 0;
@@ -1765,7 +1765,7 @@ static unsigned __init tulip_read_eeprom
return retval;
}
-static void __init de21041_get_srom_info (struct de_private *de)
+static void __devinit de21041_get_srom_info (struct de_private *de)
{
unsigned i, sa_offset = 0, ofs;
u8 ee_data[DE_EEPROM_SIZE + 6] = {};
@@ -1926,7 +1926,7 @@ bad_srom:
goto fill_defaults;
}
-static int __init de_init_one (struct pci_dev *pdev,
+static int __devinit de_init_one (struct pci_dev *pdev,
const struct pci_device_id *ent)
{
struct net_device *dev;
@@ -2082,7 +2082,7 @@ err_out_free:
return rc;
}
-static void __exit de_remove_one (struct pci_dev *pdev)
+static void __devexit de_remove_one (struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
struct de_private *de = dev->priv;
@@ -2160,7 +2160,7 @@ static struct pci_driver de_driver = {
.name = DRV_NAME,
.id_table = de_pci_tbl,
.probe = de_init_one,
- .remove = __exit_p(de_remove_one),
+ .remove = __devexit_p(de_remove_one),
#ifdef CONFIG_PM
.suspend = de_suspend,
.resume = de_resume,
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH]: Fix __devinit & __devexit declarations in de2104x driver
2007-02-26 18:36 [PATCH]: Fix __devinit & __devexit declarations in de2104x driver Prarit Bhargava
@ 2007-02-27 9:22 ` Jeff Garzik
2007-02-27 12:16 ` Prarit Bhargava
0 siblings, 1 reply; 4+ messages in thread
From: Jeff Garzik @ 2007-02-27 9:22 UTC (permalink / raw)
To: Prarit Bhargava; +Cc: linux-kernel, akpm
Prarit Bhargava wrote:
> Resending (originally sent 2007-02-14).
>
> __devinit & __devexit cleanups for de2104x driver.
>
> Fixes MODPOST warnings similar to:
>
> WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to
> .init.text:de_init_one from .data.rel.local after 'de_driver' (at offset 0x20)
> WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to
> .exit.text:de_remove_one from .data.rel.local after 'de_driver' (at offset 0x28)
>
> Signed-off-by: Prarit Bhargava <prarit@redhat.com>
doesn't apply to current kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH]: Fix __devinit & __devexit declarations in de2104x driver
2007-02-27 9:22 ` Jeff Garzik
@ 2007-02-27 12:16 ` Prarit Bhargava
0 siblings, 0 replies; 4+ messages in thread
From: Prarit Bhargava @ 2007-02-27 12:16 UTC (permalink / raw)
To: Jeff Garzik; +Cc: linux-kernel, akpm
[-- Attachment #1: Type: text/plain, Size: 644 bytes --]
Jeff Garzik wrote:
> Prarit Bhargava wrote:
>> Resending (originally sent 2007-02-14).
>>
>> __devinit & __devexit cleanups for de2104x driver.
>>
>> Fixes MODPOST warnings similar to:
>>
>> WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to
>> .init.text:de_init_one from .data.rel.local after 'de_driver' (at
>> offset 0x20)
>> WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to
>> .exit.text:de_remove_one from .data.rel.local after 'de_driver' (at
>> offset 0x28)
>>
>> Signed-off-by: Prarit Bhargava <prarit@redhat.com>
>
> doesn't apply to current kernel
Updated patch to latest git...
P.
>
>
[-- Attachment #2: 228736-v2.patch --]
[-- Type: text/plain, Size: 1467 bytes --]
__devinit & __devexit cleanups for de2104x driver.
Fixes MODPOST warnings similar to:
WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to
.init.text:de_init_one from .data.rel.local after 'de_driver' (at offset 0x20)
WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to
.exit.text:de_remove_one from .data.rel.local after 'de_driver' (at offset 0x28)
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 9d67f11..55739c7 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -1685,7 +1685,7 @@ static const struct ethtool_ops de_ethtool_ops = {
.get_regs = de_get_regs,
};
-static void __init de21040_get_mac_address (struct de_private *de)
+static void __devinit de21040_get_mac_address (struct de_private *de)
{
unsigned i;
@@ -1703,7 +1703,7 @@ static void __init de21040_get_mac_address (struct de_private *de)
}
}
-static void __init de21040_get_media_info(struct de_private *de)
+static void __devinit de21040_get_media_info(struct de_private *de)
{
unsigned int i;
@@ -1765,7 +1765,7 @@ static unsigned __devinit tulip_read_eeprom(void __iomem *regs, int location, in
return retval;
}
-static void __init de21041_get_srom_info (struct de_private *de)
+static void __devinit de21041_get_srom_info (struct de_private *de)
{
unsigned i, sa_offset = 0, ofs;
u8 ee_data[DE_EEPROM_SIZE + 6] = {};
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH]: Fix __devinit & __devexit declarations in de2104x driver
@ 2007-02-14 18:52 Prarit Bhargava
0 siblings, 0 replies; 4+ messages in thread
From: Prarit Bhargava @ 2007-02-14 18:52 UTC (permalink / raw)
To: linux-kernel, akpm, jgarzik; +Cc: Prarit Bhargava
__devinit & __devexit cleanups for de2104x driver.
Fixes MODPOST warnings similar to:
WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to
.init.text:de_init_one from .data.rel.local after 'de_driver' (at offset 0x20)
WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to
.exit.text:de_remove_one from .data.rel.local after 'de_driver' (at offset 0x28)
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
--- linux-2.6.18.ia64.orig/drivers/net/tulip/de2104x.c 2006-09-19 23:42:06.000000000 -0400
+++ linux-2.6.18.ia64/drivers/net/tulip/de2104x.c 2007-02-14 13:43:55.000000000 -0500
@@ -1685,7 +1685,7 @@ static struct ethtool_ops de_ethtool_ops
.get_regs = de_get_regs,
};
-static void __init de21040_get_mac_address (struct de_private *de)
+static void __devinit de21040_get_mac_address (struct de_private *de)
{
unsigned i;
@@ -1703,7 +1703,7 @@ static void __init de21040_get_mac_addre
}
}
-static void __init de21040_get_media_info(struct de_private *de)
+static void __devinit de21040_get_media_info(struct de_private *de)
{
unsigned int i;
@@ -1730,7 +1730,7 @@ static void __init de21040_get_media_inf
}
/* Note: this routine returns extra data bits for size detection. */
-static unsigned __init tulip_read_eeprom(void __iomem *regs, int location, int addr_len)
+static unsigned __devinit tulip_read_eeprom(void __iomem *regs, int location, int addr_len)
{
int i;
unsigned retval = 0;
@@ -1765,7 +1765,7 @@ static unsigned __init tulip_read_eeprom
return retval;
}
-static void __init de21041_get_srom_info (struct de_private *de)
+static void __devinit de21041_get_srom_info (struct de_private *de)
{
unsigned i, sa_offset = 0, ofs;
u8 ee_data[DE_EEPROM_SIZE + 6] = {};
@@ -1926,7 +1926,7 @@ bad_srom:
goto fill_defaults;
}
-static int __init de_init_one (struct pci_dev *pdev,
+static int __devinit de_init_one (struct pci_dev *pdev,
const struct pci_device_id *ent)
{
struct net_device *dev;
@@ -2082,7 +2082,7 @@ err_out_free:
return rc;
}
-static void __exit de_remove_one (struct pci_dev *pdev)
+static void __devexit de_remove_one (struct pci_dev *pdev)
{
struct net_device *dev = pci_get_drvdata(pdev);
struct de_private *de = dev->priv;
@@ -2160,7 +2160,7 @@ static struct pci_driver de_driver = {
.name = DRV_NAME,
.id_table = de_pci_tbl,
.probe = de_init_one,
- .remove = __exit_p(de_remove_one),
+ .remove = __devexit_p(de_remove_one),
#ifdef CONFIG_PM
.suspend = de_suspend,
.resume = de_resume,
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-02-27 12:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-26 18:36 [PATCH]: Fix __devinit & __devexit declarations in de2104x driver Prarit Bhargava
2007-02-27 9:22 ` Jeff Garzik
2007-02-27 12:16 ` Prarit Bhargava
-- strict thread matches above, loose matches on Subject: below --
2007-02-14 18:52 Prarit Bhargava
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).