openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

pcmcia: remove use of __devinit 

CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bill Pemberton 2012-11-19 13:23:12 -05:00 committed by Greg Kroah-Hartman
parent 96364e3a5c
commit 34cdf25a12
20 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pcmcia/bcm63xx_pcmcia.c
View File

@ -323,7 +323,7 @@ static struct pccard_operations bcm63xx_pcmcia_operations = {
/* /*
* register pcmcia socket to core * register pcmcia socket to core
*/ */
static int __devinit bcm63xx_drv_pcmcia_probe(struct platform_device *pdev) static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev)
{ {
struct bcm63xx_pcmcia_socket *skt; struct bcm63xx_pcmcia_socket *skt;
struct pcmcia_socket *sock; struct pcmcia_socket *sock;
@ -461,7 +461,7 @@ struct platform_driver bcm63xx_pcmcia_driver = {
}; };
#ifdef CONFIG_CARDBUS #ifdef CONFIG_CARDBUS
static int __devinit bcm63xx_cb_probe(struct pci_dev *dev, static int bcm63xx_cb_probe(struct pci_dev *dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
/* keep pci device */ /* keep pci device */

2
drivers/pcmcia/bfin_cf_pcmcia.c
View File

@ -195,7 +195,7 @@ static struct pccard_operations bfin_cf_ops = {
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
static int __devinit bfin_cf_probe(struct platform_device *pdev) static int bfin_cf_probe(struct platform_device *pdev)
{ {
struct bfin_cf_socket *cf; struct bfin_cf_socket *cf;
struct resource *io_mem, *attr_mem; struct resource *io_mem, *attr_mem;

2
drivers/pcmcia/db1xxx_ss.c
View File

@ -409,7 +409,7 @@ static struct pccard_operations db1x_pcmcia_operations = {
.set_mem_map = au1x00_pcmcia_set_mem_map, .set_mem_map = au1x00_pcmcia_set_mem_map,
}; };
static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev) static int db1x_pcmcia_socket_probe(struct platform_device *pdev)
{ {
struct db1x_pcmcia_sock *sock; struct db1x_pcmcia_sock *sock;
struct resource *r; struct resource *r;

2
drivers/pcmcia/ds.c
View File

@ -1318,7 +1318,7 @@ static struct pcmcia_callback pcmcia_bus_callback = {
.resume = pcmcia_bus_resume, .resume = pcmcia_bus_resume,
}; };
static int __devinit pcmcia_bus_add_socket(struct device *dev, static int pcmcia_bus_add_socket(struct device *dev,
struct class_interface *class_intf) struct class_interface *class_intf)
{ {
struct pcmcia_socket *socket = dev_get_drvdata(dev); struct pcmcia_socket *socket = dev_get_drvdata(dev);

2
drivers/pcmcia/electra_cf.c
View File

@ -181,7 +181,7 @@ static struct pccard_operations electra_cf_ops = {
.set_mem_map = electra_cf_set_mem_map, .set_mem_map = electra_cf_set_mem_map,
}; };
static int __devinit electra_cf_probe(struct platform_device *ofdev) static int electra_cf_probe(struct platform_device *ofdev)
{ {
struct device *device = &ofdev->dev; struct device *device = &ofdev->dev;
struct device_node *np = ofdev->dev.of_node; struct device_node *np = ofdev->dev.of_node;

2
drivers/pcmcia/i82092.c
View File

@ -67,7 +67,7 @@ static struct socket_info sockets[MAX_SOCKETS];
static int socket_count; /* shortcut */ static int socket_count; /* shortcut */
static int __devinit i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
{ {
unsigned char configbyte; unsigned char configbyte;
int i, ret; int i, ret;

4
drivers/pcmcia/pd6729.c
View File

@ -589,7 +589,7 @@ static int pd6729_check_irq(int irq)
return 0; return 0;
} }
static u_int __devinit pd6729_isa_scan(void) static u_int pd6729_isa_scan(void)
{ {
u_int mask0, mask = 0; u_int mask0, mask = 0;
int i; int i;
@ -620,7 +620,7 @@ static u_int __devinit pd6729_isa_scan(void)
return mask; return mask;
} }
static int __devinit pd6729_pci_probe(struct pci_dev *dev, static int pd6729_pci_probe(struct pci_dev *dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
int i, j, ret; int i, j, ret;

2
drivers/pcmcia/pxa2xx_sharpsl.c
View File

@ -208,7 +208,7 @@ static struct pcmcia_low_level sharpsl_pcmcia_ops = {
#ifdef CONFIG_SA1100_COLLIE #ifdef CONFIG_SA1100_COLLIE
#include "sa11xx_base.h" #include "sa11xx_base.h"
int __devinit pcmcia_collie_init(struct device *dev) int pcmcia_collie_init(struct device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;

2
drivers/pcmcia/rsrc_nonstatic.c
View File

@ -1199,7 +1199,7 @@ static const struct attribute_group rsrc_attributes = {
.attrs = pccard_rsrc_attributes, .attrs = pccard_rsrc_attributes,
}; };
static int __devinit pccard_sysfs_add_rsrc(struct device *dev, static int pccard_sysfs_add_rsrc(struct device *dev,
struct class_interface *class_intf) struct class_interface *class_intf)
{ {
struct pcmcia_socket *s = dev_get_drvdata(dev); struct pcmcia_socket *s = dev_get_drvdata(dev);

2
drivers/pcmcia/sa1100_assabet.c
View File

@ -95,7 +95,7 @@ static struct pcmcia_low_level assabet_pcmcia_ops = {
.socket_suspend = assabet_pcmcia_socket_suspend, .socket_suspend = assabet_pcmcia_socket_suspend,
}; };
int __devinit pcmcia_assabet_init(struct device *dev) int pcmcia_assabet_init(struct device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;

2
drivers/pcmcia/sa1100_cerf.c
View File

@ -81,7 +81,7 @@ static struct pcmcia_low_level cerf_pcmcia_ops = {
.configure_socket = cerf_pcmcia_configure_socket, .configure_socket = cerf_pcmcia_configure_socket,
}; };
int __devinit pcmcia_cerf_init(struct device *dev) int pcmcia_cerf_init(struct device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;

2
drivers/pcmcia/sa1100_generic.c
View File

@ -67,7 +67,7 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) __devinitdata = {
#endif #endif
}; };
static int __devinit sa11x0_drv_pcmcia_probe(struct platform_device *dev) static int sa11x0_drv_pcmcia_probe(struct platform_device *dev)
{ {
int i, ret = -ENODEV; int i, ret = -ENODEV;

2
drivers/pcmcia/sa1100_h3600.c
View File

@ -153,7 +153,7 @@ struct pcmcia_low_level h3600_pcmcia_ops = {
.socket_suspend = h3600_pcmcia_socket_suspend, .socket_suspend = h3600_pcmcia_socket_suspend,
}; };
int __devinit pcmcia_h3600_init(struct device *dev) int pcmcia_h3600_init(struct device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;

2
drivers/pcmcia/sa1100_shannon.c
View File

@ -92,7 +92,7 @@ static struct pcmcia_low_level shannon_pcmcia_ops = {
.configure_socket = shannon_pcmcia_configure_socket, .configure_socket = shannon_pcmcia_configure_socket,
}; };
int __devinit pcmcia_shannon_init(struct device *dev) int pcmcia_shannon_init(struct device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;

2
drivers/pcmcia/sa1100_simpad.c
View File

@ -109,7 +109,7 @@ static struct pcmcia_low_level simpad_pcmcia_ops = {
.socket_suspend = simpad_pcmcia_socket_suspend, .socket_suspend = simpad_pcmcia_socket_suspend,
}; };
int __devinit pcmcia_simpad_init(struct device *dev) int pcmcia_simpad_init(struct device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;

2
drivers/pcmcia/sa1111_jornada720.c
View File

@ -91,7 +91,7 @@ static struct pcmcia_low_level jornada720_pcmcia_ops = {
.nr = 2, .nr = 2,
}; };
int __devinit pcmcia_jornada720_init(struct device *dev) int pcmcia_jornada720_init(struct device *dev)
{ {
int ret = -ENODEV; int ret = -ENODEV;

6
drivers/pcmcia/vrc4171_card.c
View File

@ -564,7 +564,7 @@ static inline void reserve_using_irq(int slot)
vrc4171_irq_mask &= ~(1 << irq); vrc4171_irq_mask &= ~(1 << irq);
} }
static int __devinit vrc4171_add_sockets(void) static int vrc4171_add_sockets(void)
{ {
vrc4171_socket_t *socket; vrc4171_socket_t *socket;
int slot, retval; int slot, retval;
@ -631,7 +631,7 @@ static void vrc4171_remove_sockets(void)
} }
} }
static int __devinit vrc4171_card_setup(char *options) static int vrc4171_card_setup(char *options)
{ {
if (options == NULL || *options == '\0') if (options == NULL || *options == '\0')
return 1; return 1;
@ -712,7 +712,7 @@ static struct platform_driver vrc4171_card_driver = {
}, },
}; };
static int __devinit vrc4171_card_init(void) static int vrc4171_card_init(void)
{ {
int retval; int retval;

6
drivers/pcmcia/vrc4173_cardu.c
View File

@ -456,7 +456,7 @@ static void cardu_interrupt(int irq, void *dev_id)
} }
} }
static int __devinit vrc4173_cardu_probe(struct pci_dev *dev, static int vrc4173_cardu_probe(struct pci_dev *dev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
vrc4173_socket_t *socket; vrc4173_socket_t *socket;
@ -533,7 +533,7 @@ static int __devinit vrc4173_cardu_probe(struct pci_dev *dev,
return ret; return ret;
} }
static int __devinit vrc4173_cardu_setup(char *options) static int vrc4173_cardu_setup(char *options)
{ {
if (options == NULL || *options == '\0') if (options == NULL || *options == '\0')
return 1; return 1;
@ -574,7 +574,7 @@ static struct pci_driver vrc4173_cardu_driver = {
.id_table = vrc4173_cardu_id_table, .id_table = vrc4173_cardu_id_table,
}; };
static int __devinit vrc4173_cardu_init(void) static int vrc4173_cardu_init(void)
{ {
vrc4173_cardu_slots = 0; vrc4173_cardu_slots = 0;

2
drivers/pcmcia/xxs1500_ss.c
View File

@ -204,7 +204,7 @@ static struct pccard_operations xxs1500_pcmcia_operations = {
.set_mem_map = au1x00_pcmcia_set_mem_map, .set_mem_map = au1x00_pcmcia_set_mem_map,
}; };
static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev) static int xxs1500_pcmcia_probe(struct platform_device *pdev)
{ {
struct xxs1500_pcmcia_sock *sock; struct xxs1500_pcmcia_sock *sock;
struct resource *r; struct resource *r;

2
drivers/pcmcia/yenta_socket.c
View File

@ -1142,7 +1142,7 @@ static void yenta_fixup_parent_bridge(struct pci_bus *cardbus_bridge)
* interrupt, and that we can map the cardbus area. Fill in the * interrupt, and that we can map the cardbus area. Fill in the
* socket information structure.. * socket information structure..
*/ */
static int __devinit yenta_probe(struct pci_dev *dev, const struct pci_device_id *id) static int yenta_probe(struct pci_dev *dev, const struct pci_device_id *id)
{ {
struct yenta_socket *socket; struct yenta_socket *socket;
int ret; int ret;