Module: xenomai-forge
Branch: next
Commit: 199777c7c33d5e26066e478f2cc85d578253768f
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=199777c7c33d5e26066e478f2cc85d578253768f

Author: Jan Kiszka <jan.kis...@siemens.com>
Date:   Wed Feb  6 14:12:15 2013 +0100

kernel/drivers: remove hot-plug attributes

Hot-plugging is no longer optional with recent kernels, so the
__devinit*/__devexit* attributes disappeared. We could wrap them, but
the price for older kernels of simply removing them is ok. So let's
move forward.

Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>

---

 .../drivers/analogy/national_instruments/pcimio.c  |    2 +-
 kernel/drivers/can/mscan/rtcan_mscan_mpc5xxx.c     |   60 +++++++------------
 kernel/drivers/can/rtcan_flexcan.c                 |   10 ++--
 kernel/drivers/can/sja1000/rtcan_adv_pci.c         |    8 +-
 kernel/drivers/can/sja1000/rtcan_ems_pci.c         |    8 +-
 kernel/drivers/can/sja1000/rtcan_esd_pci.c         |    8 +-
 kernel/drivers/can/sja1000/rtcan_ixxat_pci.c       |    8 +-
 kernel/drivers/can/sja1000/rtcan_peak_pci.c        |    8 +-
 kernel/drivers/can/sja1000/rtcan_plx_pci.c         |   18 +++---
 kernel/drivers/serial/16550A_pci.h                 |    8 +-
 kernel/drivers/serial/mpc52xx_uart.c               |   14 ++--
 11 files changed, 68 insertions(+), 84 deletions(-)

diff --git a/kernel/drivers/analogy/national_instruments/pcimio.c 
b/kernel/drivers/analogy/national_instruments/pcimio.c
index 1022836..0eb2e2f 100644
--- a/kernel/drivers/analogy/national_instruments/pcimio.c
+++ b/kernel/drivers/analogy/national_instruments/pcimio.c
@@ -92,7 +92,7 @@
 #define PCIMIO_IRQ_POLARITY 1
 
 /* The following two tables must be in the same order */
-static struct pci_device_id ni_pci_table[] __devinitdata = {
+static struct pci_device_id ni_pci_table[] __maybe_unused = {
        { PCI_VENDOR_ID_NATINST, 0x0162, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
        { PCI_VENDOR_ID_NATINST, 0x1170, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
        { PCI_VENDOR_ID_NATINST, 0x1180, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
diff --git a/kernel/drivers/can/mscan/rtcan_mscan_mpc5xxx.c 
b/kernel/drivers/can/mscan/rtcan_mscan_mpc5xxx.c
index a6d4f15..af6c09b 100644
--- a/kernel/drivers/can/mscan/rtcan_mscan_mpc5xxx.c
+++ b/kernel/drivers/can/mscan/rtcan_mscan_mpc5xxx.c
@@ -21,7 +21,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
@@ -47,14 +46,14 @@ struct mpc5xxx_can_data {
 };
 
 #ifdef CONFIG_PPC_MPC52xx
-static struct of_device_id __devinitdata mpc52xx_cdm_ids[] = {
+static struct of_device_id mpc52xx_cdm_ids[] = {
        { .compatible = "fsl,mpc5200-cdm", },
        {}
 };
 
-static u32 __devinit mpc52xx_can_get_clock(struct of_device *ofdev,
-                                          const char *clock_name,
-                                          int *mscan_clksrc)
+static u32 mpc52xx_can_get_clock(struct of_device *ofdev,
+                                const char *clock_name,
+                                int *mscan_clksrc)
 {
        unsigned int pvr;
        struct mpc52xx_cdm  __iomem *cdm;
@@ -105,9 +104,9 @@ static u32 __devinit mpc52xx_can_get_clock(struct of_device 
*ofdev,
        return freq;
 }
 #else /* !CONFIG_PPC_MPC5200 */
-static u32 __devinit mpc52xx_can_get_clock(struct of_device *ofdev,
-                                          const char *clock_name,
-                                          int *mscan_clksrc)
+static u32 mpc52xx_can_get_clock(struct of_device *ofdev,
+                                const char *clock_name,
+                                int *mscan_clksrc)
 {
        return 0;
 }
@@ -128,14 +127,14 @@ struct mpc512x_clockctl {
        u32 mccr[4];            /* MSCAN Clk Ctrl Reg 1-3 */
 };
 
-static struct of_device_id __devinitdata mpc512x_clock_ids[] = {
+static struct of_device_id mpc512x_clock_ids[] = {
        { .compatible = "fsl,mpc5121-clock", },
        {}
 };
 
-static u32 __devinit mpc512x_can_get_clock(struct of_device *ofdev,
-                                          const char *clock_name,
-                                          int *mscan_clksrc)
+static u32 mpc512x_can_get_clock(struct of_device *ofdev,
+                                const char *clock_name,
+                                int *mscan_clksrc)
 {
        struct mpc512x_clockctl __iomem *clockctl;
        struct device_node *np_clock;
@@ -243,21 +242,16 @@ exit_unmap:
        return freq;
 }
 #else /* !CONFIG_PPC_MPC512x */
-static u32 __devinit mpc512x_can_get_clock(struct of_device *ofdev,
-                                          const char *clock_name,
-                                          int *mscan_clksrc)
+static u32 mpc512x_can_get_clock(struct of_device *ofdev,
+                                const char *clock_name,
+                                int *mscan_clksrc)
 {
        return 0;
 }
 #endif /* CONFIG_PPC_MPC512x */
 
 static struct of_device_id mpc5xxx_can_table[];
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
-static int __devinit mpc5xxx_can_probe(struct of_device *ofdev,
-                                      const struct of_device_id *id)
-#else /* Linux >= 3.0 */
-static int __devinit mpc5xxx_can_probe(struct of_device *ofdev)
-#endif /* Linux >= 3.0 */
+static int mpc5xxx_can_probe(struct of_device *ofdev)
 {
        struct device_node *np = mpc5xxx_get_of_node(ofdev);
        struct mpc5xxx_can_data *data;
@@ -266,13 +260,13 @@ static int __devinit mpc5xxx_can_probe(struct of_device 
*ofdev)
        const char *clock_name = NULL;
        int irq, mscan_clksrc = 0;
        int err = -ENOMEM;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
+
        const struct of_device_id *id;
 
        id = of_match_device(mpc5xxx_can_table, &ofdev->dev);
        if (!id)
                return -EINVAL;
-#endif /* Linux >= 3.0 */
+
        data = (struct mpc5xxx_can_data *)id->data;
 
        base = of_iomap(np, 0);
@@ -333,7 +327,7 @@ exit_unmap_mem:
        return err;
 }
 
-static int __devexit mpc5xxx_can_remove(struct of_device *ofdev)
+static int mpc5xxx_can_remove(struct of_device *ofdev)
 {
        struct rtcan_device *dev = dev_get_drvdata(&ofdev->dev);
 
@@ -346,24 +340,23 @@ static int __devexit mpc5xxx_can_remove(struct of_device 
*ofdev)
        return 0;
 }
 
-static struct mpc5xxx_can_data __devinitdata mpc5200_can_data = {
+static struct mpc5xxx_can_data mpc5200_can_data = {
        .type = MSCAN_TYPE_MPC5200,
        .get_clock = mpc52xx_can_get_clock,
 };
 
-static struct mpc5xxx_can_data __devinitdata mpc5121_can_data = {
+static struct mpc5xxx_can_data mpc5121_can_data = {
        .type = MSCAN_TYPE_MPC5121,
        .get_clock = mpc512x_can_get_clock,
 };
 
-static struct of_device_id __devinitdata mpc5xxx_can_table[] = {
+static struct of_device_id mpc5xxx_can_table[] = {
        { .compatible = "fsl,mpc5200-mscan", .data = &mpc5200_can_data, },
        /* Note that only MPC5121 Rev. 2 (and later) is supported */
        { .compatible = "fsl,mpc5121-mscan", .data = &mpc5121_can_data, },
        {},
 };
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
 static struct of_platform_driver mpc5xxx_can_driver = {
        .driver = {
                .owner = THIS_MODULE,
@@ -371,17 +364,8 @@ static struct of_platform_driver mpc5xxx_can_driver = {
                .of_match_table = mpc5xxx_can_table,
        },
        .probe = mpc5xxx_can_probe,
-       .remove = __devexit_p(mpc5xxx_can_remove),
-};
-#else
-static struct of_platform_driver mpc5xxx_can_driver = {
-       .owner = THIS_MODULE,
-       .name = RTCAN_DRV_NAME,
-       .probe = mpc5xxx_can_probe,
-       .remove = __devexit_p(mpc5xxx_can_remove),
-       .match_table = mpc5xxx_can_table,
+       .remove = mpc5xxx_can_remove,
 };
-#endif
 
 static int __init mpc5xxx_can_init(void)
 {
diff --git a/kernel/drivers/can/rtcan_flexcan.c 
b/kernel/drivers/can/rtcan_flexcan.c
index 3e48f91..4176a8b 100644
--- a/kernel/drivers/can/rtcan_flexcan.c
+++ b/kernel/drivers/can/rtcan_flexcan.c
@@ -906,7 +906,7 @@ int flexcan_set_mode(struct rtcan_device *dev, can_mode_t 
mode,
        return err;
 }
 
-static int __devinit register_flexcandev(struct rtcan_device *dev)
+static int register_flexcandev(struct rtcan_device *dev)
 {
        struct flexcan_priv *priv = rtcan_priv(dev);
        struct flexcan_regs __iomem *regs = priv->base;
@@ -955,13 +955,13 @@ out_chip_disable:
        return err;
 }
 
-static void __devexit unregister_flexcandev(struct rtcan_device *dev)
+static void unregister_flexcandev(struct rtcan_device *dev)
 {
        flexcan_mode_stop(dev, NULL);
        rtcan_dev_unregister(dev);
 }
 
-static int __devinit flexcan_probe(struct platform_device *pdev)
+static int flexcan_probe(struct platform_device *pdev)
 {
        struct rtcan_device *dev;
        struct flexcan_priv *priv;
@@ -1071,7 +1071,7 @@ out_clock:
        return err;
 }
 
-static int __devexit flexcan_remove(struct platform_device *pdev)
+static int flexcan_remove(struct platform_device *pdev)
 {
        struct rtcan_device *dev = platform_get_drvdata(pdev);
        struct flexcan_priv *priv = rtcan_priv(dev);
@@ -1107,7 +1107,7 @@ static struct platform_driver flexcan_driver = {
                .of_match_table = flexcan_of_match,
        },
        .probe = flexcan_probe,
-       .remove = __devexit_p(flexcan_remove),
+       .remove = flexcan_remove,
 };
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)
diff --git a/kernel/drivers/can/sja1000/rtcan_adv_pci.c 
b/kernel/drivers/can/sja1000/rtcan_adv_pci.c
index d17202d..1d36e7b 100644
--- a/kernel/drivers/can/sja1000/rtcan_adv_pci.c
+++ b/kernel/drivers/can/sja1000/rtcan_adv_pci.c
@@ -236,8 +236,8 @@ failure:
        return ret;
 }
 
-static int __devinit adv_pci_init_one(struct pci_dev *pdev,
-                                     const struct pci_device_id *ent)
+static int adv_pci_init_one(struct pci_dev *pdev,
+                           const struct pci_device_id *ent)
 {
        int ret, channel;
        unsigned int nb_ports = 0;
@@ -332,7 +332,7 @@ failure:
        return ret;
 }
 
-static void __devexit adv_pci_remove_one(struct pci_dev *pdev)
+static void adv_pci_remove_one(struct pci_dev *pdev)
 {
        struct rtcan_device *dev = pci_get_drvdata(pdev);
        struct rtcan_adv_pci *board = (struct rtcan_adv_pci *)dev->board_priv;
@@ -351,7 +351,7 @@ static struct pci_driver rtcan_adv_pci_driver = {
        .name = RTCAN_DRV_NAME,
        .id_table = adv_pci_tbl,
        .probe = adv_pci_init_one,
-       .remove = __devexit_p(adv_pci_remove_one),
+       .remove = adv_pci_remove_one,
 };
 
 static int __init rtcan_adv_pci_init(void)
diff --git a/kernel/drivers/can/sja1000/rtcan_ems_pci.c 
b/kernel/drivers/can/sja1000/rtcan_ems_pci.c
index f69b5b8..4a88ca6 100644
--- a/kernel/drivers/can/sja1000/rtcan_ems_pci.c
+++ b/kernel/drivers/can/sja1000/rtcan_ems_pci.c
@@ -252,8 +252,8 @@ failure:
        return err;
 }
 
-static int __devinit ems_pci_init_one (struct pci_dev *pdev,
-                                      const struct pci_device_id *ent)
+static int ems_pci_init_one(struct pci_dev *pdev,
+                           const struct pci_device_id *ent)
 {
        struct rtcan_device *master_dev = NULL;
        int err;
@@ -291,7 +291,7 @@ failure:
 
 }
 
-static void __devexit ems_pci_remove_one (struct pci_dev *pdev)
+static void ems_pci_remove_one(struct pci_dev *pdev)
 {
        struct rtcan_device *dev = pci_get_drvdata(pdev);
        struct rtcan_ems_pci *board = (struct rtcan_ems_pci *)dev->board_priv;
@@ -312,7 +312,7 @@ static struct pci_driver rtcan_ems_pci_driver = {
        .name           = RTCAN_DRV_NAME,
        .id_table       = ems_pci_tbl,
        .probe          = ems_pci_init_one,
-       .remove         = __devexit_p(ems_pci_remove_one),
+       .remove         = ems_pci_remove_one,
 };
 
 static int __init rtcan_ems_pci_init(void)
diff --git a/kernel/drivers/can/sja1000/rtcan_esd_pci.c 
b/kernel/drivers/can/sja1000/rtcan_esd_pci.c
index 575d412..e838baf 100644
--- a/kernel/drivers/can/sja1000/rtcan_esd_pci.c
+++ b/kernel/drivers/can/sja1000/rtcan_esd_pci.c
@@ -216,8 +216,8 @@ failure:
        return ret;
 }
 
-static int __devinit esd_pci_init_one(struct pci_dev *pdev,
-                                     const struct pci_device_id *ent)
+static int esd_pci_init_one(struct pci_dev *pdev,
+                           const struct pci_device_id *ent)
 {
        int ret, channel;
        void __iomem *base_addr;
@@ -306,7 +306,7 @@ failure:
        return ret;
 }
 
-static void __devexit esd_pci_remove_one(struct pci_dev *pdev)
+static void esd_pci_remove_one(struct pci_dev *pdev)
 {
        struct rtcan_device *dev = pci_get_drvdata(pdev);
        struct rtcan_esd_pci *board = (struct rtcan_esd_pci *)dev->board_priv;
@@ -337,7 +337,7 @@ static struct pci_driver rtcan_esd_pci_driver = {
        .name = RTCAN_DRV_NAME,
        .id_table = esd_pci_tbl,
        .probe = esd_pci_init_one,
-       .remove = __devexit_p(esd_pci_remove_one),
+       .remove = esd_pci_remove_one,
 };
 
 static int __init rtcan_esd_pci_init(void)
diff --git a/kernel/drivers/can/sja1000/rtcan_ixxat_pci.c 
b/kernel/drivers/can/sja1000/rtcan_ixxat_pci.c
index 9435ca4..ea0d0f3 100644
--- a/kernel/drivers/can/sja1000/rtcan_ixxat_pci.c
+++ b/kernel/drivers/can/sja1000/rtcan_ixxat_pci.c
@@ -204,8 +204,8 @@ static int rtcan_ixxat_pci_add_chan(struct pci_dev *pdev,
     return ret;
 }
 
-static int __devinit ixxat_pci_init_one (struct pci_dev *pdev,
-                                        const struct pci_device_id *ent)
+static int ixxat_pci_init_one(struct pci_dev *pdev,
+                             const struct pci_device_id *ent)
 {
     int ret, channel, conf_addr;
     unsigned long addr;
@@ -273,7 +273,7 @@ failure:
     return ret;
 }
 
-static void __devexit ixxat_pci_remove_one (struct pci_dev *pdev)
+static void ixxat_pci_remove_one(struct pci_dev *pdev)
 {
     struct rtcan_device *dev = pci_get_drvdata(pdev);
     struct rtcan_ixxat_pci *board = (struct rtcan_ixxat_pci *)dev->board_priv;
@@ -291,7 +291,7 @@ static struct pci_driver rtcan_ixxat_pci_driver = {
        .name = RTCAN_DRV_NAME,
        .id_table = ixxat_pci_tbl,
        .probe = ixxat_pci_init_one,
-       .remove = __devexit_p(ixxat_pci_remove_one),
+       .remove = ixxat_pci_remove_one,
 };
 
 static int __init rtcan_ixxat_pci_init(void)
diff --git a/kernel/drivers/can/sja1000/rtcan_peak_pci.c 
b/kernel/drivers/can/sja1000/rtcan_peak_pci.c
index b5ad226..a19b917 100644
--- a/kernel/drivers/can/sja1000/rtcan_peak_pci.c
+++ b/kernel/drivers/can/sja1000/rtcan_peak_pci.c
@@ -265,8 +265,8 @@ static int rtcan_peak_pci_add_chan(struct pci_dev *pdev, 
int channel,
     return ret;
 }
 
-static int __devinit peak_pci_init_one (struct pci_dev *pdev,
-                                       const struct pci_device_id *ent)
+static int peak_pci_init_one(struct pci_dev *pdev,
+                            const struct pci_device_id *ent)
 {
     int ret;
     u16 sub_sys_id;
@@ -318,7 +318,7 @@ static int __devinit peak_pci_init_one (struct pci_dev 
*pdev,
 
 }
 
-static void __devexit peak_pci_remove_one (struct pci_dev *pdev)
+static void peak_pci_remove_one(struct pci_dev *pdev)
 {
     struct rtcan_device *dev = pci_get_drvdata(pdev);
     struct rtcan_peak_pci *board = (struct rtcan_peak_pci *)dev->board_priv;
@@ -336,7 +336,7 @@ static struct pci_driver rtcan_peak_pci_driver = {
        .name           = RTCAN_DRV_NAME,
        .id_table       = peak_pci_tbl,
        .probe          = peak_pci_init_one,
-       .remove         = __devexit_p(peak_pci_remove_one),
+       .remove         = peak_pci_remove_one,
 };
 
 static int __init rtcan_peak_pci_init(void)
diff --git a/kernel/drivers/can/sja1000/rtcan_plx_pci.c 
b/kernel/drivers/can/sja1000/rtcan_plx_pci.c
index bb2c547..9df132c 100644
--- a/kernel/drivers/can/sja1000/rtcan_plx_pci.c
+++ b/kernel/drivers/can/sja1000/rtcan_plx_pci.c
@@ -157,7 +157,7 @@ struct plx_pci_card_info {
        void (*reset_func)(struct pci_dev *pdev);
 };
 
-static struct plx_pci_card_info plx_pci_card_info_adlink __devinitdata = {
+static struct plx_pci_card_info plx_pci_card_info_adlink = {
        "Adlink PCI-7841/cPCI-7841", 2,
        PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
        {1, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x80, 0x80} },
@@ -165,7 +165,7 @@ static struct plx_pci_card_info plx_pci_card_info_adlink 
__devinitdata = {
        /* based on PLX9052 */
 };
 
-static struct plx_pci_card_info plx_pci_card_info_adlink_se __devinitdata = {
+static struct plx_pci_card_info plx_pci_card_info_adlink_se = {
        "Adlink PCI-7841/cPCI-7841 SE", 2,
        PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
        {0, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x80, 0x80} },
@@ -173,7 +173,7 @@ static struct plx_pci_card_info plx_pci_card_info_adlink_se 
__devinitdata = {
        /* based on PLX9052 */
 };
 
-static struct plx_pci_card_info plx_pci_card_info_esd200 __devinitdata = {
+static struct plx_pci_card_info plx_pci_card_info_esd200 = {
        "esd CAN-PCI/CPCI/PCI104/200", 2,
        PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
        {0, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x100, 0x80} },
@@ -181,7 +181,7 @@ static struct plx_pci_card_info plx_pci_card_info_esd200 
__devinitdata = {
        /* based on PLX9030/9050 */
 };
 
-static struct plx_pci_card_info plx_pci_card_info_esd266 __devinitdata = {
+static struct plx_pci_card_info plx_pci_card_info_esd266 = {
        "esd CAN-PCI/PMC/266", 2,
        PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
        {0, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x100, 0x80} },
@@ -189,7 +189,7 @@ static struct plx_pci_card_info plx_pci_card_info_esd266 
__devinitdata = {
        /* based on PLX9056 */
 };
 
-static struct plx_pci_card_info plx_pci_card_info_esd2000 __devinitdata = {
+static struct plx_pci_card_info plx_pci_card_info_esd2000 = {
        "esd CAN-PCIe/2000", 2,
        PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
        {0, 0x00, 0x00}, { {2, 0x00, 0x80}, {2, 0x100, 0x80} },
@@ -197,7 +197,7 @@ static struct plx_pci_card_info plx_pci_card_info_esd2000 
__devinitdata = {
        /* based on PEX8311 */
 };
 
-static struct plx_pci_card_info plx_pci_card_info_marathon __devinitdata = {
+static struct plx_pci_card_info plx_pci_card_info_marathon = {
        "Marathon CAN-bus-PCI", 2,
        PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
        {0, 0x00, 0x00}, { {2, 0x00, 0x00}, {4, 0x00, 0x00} },
@@ -205,7 +205,7 @@ static struct plx_pci_card_info plx_pci_card_info_marathon 
__devinitdata = {
        /* based on PLX9052 */
 };
 
-static struct plx_pci_card_info plx_pci_card_info_tews __devinitdata = {
+static struct plx_pci_card_info plx_pci_card_info_tews = {
        "TEWS TECHNOLOGIES TPMC810", 2,
        PLX_PCI_CAN_CLOCK, PLX_PCI_OCR, PLX_PCI_CDR,
        {0, 0x00, 0x00}, { {2, 0x000, 0x80}, {2, 0x100, 0x80} },
@@ -449,8 +449,8 @@ static void plx_pci_del_card(struct pci_dev *pdev)
  * Probe PLX90xx based device for the SJA1000 chips and register each
  * available CAN channel to SJA1000 Socket-CAN subsystem.
  */
-static int __devinit plx_pci_add_card(struct pci_dev *pdev,
-                                     const struct pci_device_id *ent)
+static int plx_pci_add_card(struct pci_dev *pdev,
+                           const struct pci_device_id *ent)
 {
        struct rtcan_sja1000 *chip;
        struct rtcan_device *dev;
diff --git a/kernel/drivers/serial/16550A_pci.h 
b/kernel/drivers/serial/16550A_pci.h
index 4cfc296..5c12023 100644
--- a/kernel/drivers/serial/16550A_pci.h
+++ b/kernel/drivers/serial/16550A_pci.h
@@ -212,8 +212,8 @@ DEFINE_PCI_DEVICE_TABLE( rt_16550_pci_table ) = {
        { }
 };
 
-static int __devinit rt_16550_pci_probe( struct pci_dev *pdev,
-                                        const struct pci_device_id *ent )
+static int rt_16550_pci_probe(struct pci_dev *pdev,
+                             const struct pci_device_id *ent)
 {
        struct rt_16550_pci_board *board;
        int err;
@@ -253,7 +253,7 @@ static int __devinit rt_16550_pci_probe( struct pci_dev 
*pdev,
        return 0;
 }
 
-static void __devexit rt_16550_pci_remove( struct pci_dev *pdev ) {
+static void rt_16550_pci_remove(struct pci_dev *pdev) {
        pci_disable_device( pdev );
 };
 
@@ -261,7 +261,7 @@ static struct pci_driver rt_16550_pci_driver = {
        .name     = RT_16550_DRIVER_NAME,
        .id_table = rt_16550_pci_table,
        .probe    = rt_16550_pci_probe,
-       .remove   = __devexit_p(rt_16550_pci_remove)
+       .remove   = rt_16550_pci_remove
 };
 
 static int pci_registered;
diff --git a/kernel/drivers/serial/mpc52xx_uart.c 
b/kernel/drivers/serial/mpc52xx_uart.c
index 8f99910..33109dc 100644
--- a/kernel/drivers/serial/mpc52xx_uart.c
+++ b/kernel/drivers/serial/mpc52xx_uart.c
@@ -236,7 +236,7 @@ static struct of_device_id mpc5200_gpio_ids[] = {
        {}
 };
 
-static void __devinit rt_mpc52xx_uart_init_hw(struct rt_mpc52xx_uart_port 
*port)
+static void rt_mpc52xx_uart_init_hw(struct rt_mpc52xx_uart_port *port)
 {
        struct mpc52xx_gpio __iomem *gpio;
        struct device_node *gpio_np;
@@ -1242,7 +1242,7 @@ static ssize_t rt_mpc52xx_uart_write(struct 
rtdm_dev_context *context,
        return ret;
 }
 
-static const struct rtdm_device __devinitdata device_tmpl = {
+static const struct rtdm_device device_tmpl = {
        .struct_version         = RTDM_DEVICE_STRUCT_VER,
 
        .device_flags           = RTDM_NAMED_DEVICE | RTDM_EXCLUSIVE,
@@ -1273,10 +1273,10 @@ static const struct rtdm_device __devinitdata 
device_tmpl = {
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
 
-static int __devinit rt_mpc52xx_uart_of_probe(struct platform_device *op)
+static int rt_mpc52xx_uart_of_probe(struct platform_device *op)
 #else
-static int __devinit rt_mpc52xx_uart_of_probe(struct platform_device *op,
-                                             const struct of_device_id *match)
+static int rt_mpc52xx_uart_of_probe(struct platform_device *op,
+                                   const struct of_device_id *match)
 #endif
 {
        struct rt_mpc52xx_uart_port *port;
@@ -1385,7 +1385,7 @@ out_kfree_port:
        return ret;
 }
 
-static int __devinit rt_mpc52xx_uart_of_remove(struct platform_device *op)
+static int rt_mpc52xx_uart_of_remove(struct platform_device *op)
 {
        struct rtdm_device *dev = dev_get_drvdata(&op->dev);
        struct rt_mpc52xx_uart_port *port = dev->device_data;
@@ -1413,7 +1413,7 @@ MODULE_DEVICE_TABLE(of, rt_mpc52xx_uart_of_match);
 
 static struct of_platform_driver rt_mpc52xx_uart_of_driver = {
        .probe = rt_mpc52xx_uart_of_probe,
-       .remove =  __devexit_p(rt_mpc52xx_uart_of_remove),
+       .remove =  rt_mpc52xx_uart_of_remove,
        .driver = {
                .name = "rt-mpc52xx-psc-uart",
                .owner = THIS_MODULE,


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to