A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 03:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into for-next

Browse source 
Conflicts:
	drivers/devfreq/exynos4_bus.c

Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
This commit is contained in:
Jiri Kosina 2013-01-29 10:48:30 +01:00
commit 617677295b
11382 changed files with 530741 additions and 302619 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/pcmcia/at91_cf.c
View file

@ -17,6 +17,7 @@
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/gpio.h>
#include <linux/platform_data/atmel.h>
#include <pcmcia/ss.h>
@ -24,7 +25,6 @@
#include <asm/io.h>
#include <asm/sizes.h>
#include <mach/board.h>
#include <mach/at91rm9200_mc.h>
#include <mach/at91_ramc.h>

12
drivers/pcmcia/bcm63xx_pcmcia.c
View file

@ -323,7 +323,7 @@ static struct pccard_operations bcm63xx_pcmcia_operations = {
/*
* 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 pcmcia_socket *sock;
@ -436,7 +436,7 @@ err:
return ret;
}
static int __devexit bcm63xx_drv_pcmcia_remove(struct platform_device *pdev)
static int bcm63xx_drv_pcmcia_remove(struct platform_device *pdev)
{
struct bcm63xx_pcmcia_socket *skt;
struct resource *res;
@ -453,7 +453,7 @@ static int __devexit bcm63xx_drv_pcmcia_remove(struct platform_device *pdev)
struct platform_driver bcm63xx_pcmcia_driver = {
.probe = bcm63xx_drv_pcmcia_probe,
.remove = __devexit_p(bcm63xx_drv_pcmcia_remove),
.remove = bcm63xx_drv_pcmcia_remove,
.driver = {
.name = "bcm63xx_pcmcia",
.owner = THIS_MODULE,
@ -461,7 +461,7 @@ struct platform_driver bcm63xx_pcmcia_driver = {
};
#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)
{
/* keep pci device */
@ -469,7 +469,7 @@ static int __devinit bcm63xx_cb_probe(struct pci_dev *dev,
return platform_driver_register(&bcm63xx_pcmcia_driver);
}
static void __devexit bcm63xx_cb_exit(struct pci_dev *dev)
static void bcm63xx_cb_exit(struct pci_dev *dev)
{
platform_driver_unregister(&bcm63xx_pcmcia_driver);
bcm63xx_cb_dev = NULL;
@ -503,7 +503,7 @@ static struct pci_driver bcm63xx_cardbus_driver = {
.name = "bcm63xx_cardbus",
.id_table = bcm63xx_cb_table,
.probe = bcm63xx_cb_probe,
.remove = __devexit_p(bcm63xx_cb_exit),
.remove = bcm63xx_cb_exit,
};
#endif

6
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 resource *io_mem, *attr_mem;
@ -286,7 +286,7 @@ fail0:
return status;
}
static int __devexit bfin_cf_remove(struct platform_device *pdev)
static int bfin_cf_remove(struct platform_device *pdev)
{
struct bfin_cf_socket *cf = platform_get_drvdata(pdev);
@ -307,7 +307,7 @@ static struct platform_driver bfin_cf_driver = {
.owner = THIS_MODULE,
},
.probe = bfin_cf_probe,
.remove = __devexit_p(bfin_cf_remove),
.remove = bfin_cf_remove,
};
module_platform_driver(bfin_cf_driver);

6
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,
};
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 resource *r;
@ -559,7 +559,7 @@ out0:
return ret;
}
static int __devexit db1x_pcmcia_socket_remove(struct platform_device *pdev)
static int db1x_pcmcia_socket_remove(struct platform_device *pdev)
{
struct db1x_pcmcia_sock *sock = platform_get_drvdata(pdev);
@ -577,7 +577,7 @@ static struct platform_driver db1x_pcmcia_socket_driver = {
.owner = THIS_MODULE,
},
.probe = db1x_pcmcia_socket_probe,
.remove = __devexit_p(db1x_pcmcia_socket_remove),
.remove = db1x_pcmcia_socket_remove,
};
module_platform_driver(db1x_pcmcia_socket_driver);

13
drivers/pcmcia/ds.c
View file

@ -920,8 +920,6 @@ static int pcmcia_bus_match(struct device *dev, struct device_driver *drv)
return 0;
}
#ifdef CONFIG_HOTPLUG
static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
{
struct pcmcia_device *p_dev;
@ -962,15 +960,6 @@ static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
return 0;
}
#else
static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
{
return -ENODEV;
}
#endif
/************************ runtime PM support ***************************/
static int pcmcia_dev_suspend(struct device *dev, pm_message_t state);
@ -1329,7 +1318,7 @@ static struct pcmcia_callback pcmcia_bus_callback = {
.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 pcmcia_socket *socket = dev_get_drvdata(dev);

4
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,
};
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_node *np = ofdev->dev.of_node;
@ -324,7 +324,7 @@ fail1:
}
static int __devexit electra_cf_remove(struct platform_device *ofdev)
static int electra_cf_remove(struct platform_device *ofdev)
{
struct device *device = &ofdev->dev;
struct electra_cf_socket *cf;

6
drivers/pcmcia/i82092.c
View file

@ -35,7 +35,7 @@ static struct pci_driver i82092aa_pci_driver = {
.name = "i82092aa",
.id_table = i82092aa_pci_ids,
.probe = i82092aa_pci_probe,
.remove = __devexit_p(i82092aa_pci_remove),
.remove = i82092aa_pci_remove,
};
@ -67,7 +67,7 @@ static struct socket_info sockets[MAX_SOCKETS];
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;
int i, ret;
@ -162,7 +162,7 @@ err_out_disable:
return ret;
}
static void __devexit i82092aa_pci_remove(struct pci_dev *dev)
static void i82092aa_pci_remove(struct pci_dev *dev)
{
struct pcmcia_socket *socket = pci_get_drvdata(dev);

2
drivers/pcmcia/omap_cf.c
View file

@ -25,7 +25,7 @@
#include <asm/sizes.h>
#include <mach/mux.h>
#include <plat/tc.h>
#include <mach/tc.h>
/* NOTE: don't expect this to support many I/O cards. The 16xx chips have

8
drivers/pcmcia/pd6729.c
View file

@ -589,7 +589,7 @@ static int pd6729_check_irq(int irq)
return 0;
}
static u_int __devinit pd6729_isa_scan(void)
static u_int pd6729_isa_scan(void)
{
u_int mask0, mask = 0;
int i;
@ -620,7 +620,7 @@ static u_int __devinit pd6729_isa_scan(void)
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)
{
int i, j, ret;
@ -739,7 +739,7 @@ err_out_free_mem:
return ret;
}
static void __devexit pd6729_pci_remove(struct pci_dev *dev)
static void pd6729_pci_remove(struct pci_dev *dev)
{
int i;
struct pd6729_socket *socket = pci_get_drvdata(dev);
@ -772,7 +772,7 @@ static struct pci_driver pd6729_pci_driver = {
.name = "pd6729",
.id_table = pd6729_pci_ids,
.probe = pd6729_pci_probe,
.remove = __devexit_p(pd6729_pci_remove),
.remove = pd6729_pci_remove,
};
static int pd6729_module_init(void)

2
drivers/pcmcia/pxa2xx_sharpsl.c
View file

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

6
drivers/pcmcia/rsrc_nonstatic.c
View file

@ -1199,7 +1199,7 @@ static const struct attribute_group 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 pcmcia_socket *s = dev_get_drvdata(dev);
@ -1209,7 +1209,7 @@ static int __devinit pccard_sysfs_add_rsrc(struct device *dev,
return sysfs_create_group(&dev->kobj, &rsrc_attributes);
}
static void __devexit pccard_sysfs_remove_rsrc(struct device *dev,
static void pccard_sysfs_remove_rsrc(struct device *dev,
struct class_interface *class_intf)
{
struct pcmcia_socket *s = dev_get_drvdata(dev);
@ -1222,7 +1222,7 @@ static void __devexit pccard_sysfs_remove_rsrc(struct device *dev,
static struct class_interface pccard_rsrc_interface __refdata = {
.class = &pcmcia_socket_class,
.add_dev = &pccard_sysfs_add_rsrc,
.remove_dev = __devexit_p(&pccard_sysfs_remove_rsrc),
.remove_dev = &pccard_sysfs_remove_rsrc,
};
static int __init nonstatic_sysfs_init(void)

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,
};
int __devinit pcmcia_assabet_init(struct device *dev)
int pcmcia_assabet_init(struct device *dev)
{
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,
};
int __devinit pcmcia_cerf_init(struct device *dev)
int pcmcia_cerf_init(struct device *dev)
{
int ret = -ENODEV;

4
drivers/pcmcia/sa1100_generic.c
View file

@ -43,7 +43,7 @@
int __init pcmcia_collie_init(struct device *dev);
static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) __devinitdata = {
static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = {
#ifdef CONFIG_SA1100_ASSABET
pcmcia_assabet_init,
#endif
@ -67,7 +67,7 @@ static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) __devinitdata = {
#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;

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,
};
int __devinit pcmcia_h3600_init(struct device *dev)
int pcmcia_h3600_init(struct device *dev)
{
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,
};
int __devinit pcmcia_shannon_init(struct device *dev)
int pcmcia_shannon_init(struct device *dev)
{
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,
};
int __devinit pcmcia_simpad_init(struct device *dev)
int pcmcia_simpad_init(struct device *dev)
{
int ret = -ENODEV;

4
drivers/pcmcia/sa1111_generic.c
View file

@ -211,7 +211,7 @@ static int pcmcia_probe(struct sa1111_dev *dev)
return 0;
}
static int __devexit pcmcia_remove(struct sa1111_dev *dev)
static int pcmcia_remove(struct sa1111_dev *dev)
{
struct sa1111_pcmcia_socket *next, *s = dev_get_drvdata(&dev->dev);
@ -234,7 +234,7 @@ static struct sa1111_driver pcmcia_driver = {
},
.devid = SA1111_DEVID_PCMCIA,
.probe = pcmcia_probe,
.remove = __devexit_p(pcmcia_remove),
.remove = pcmcia_remove,
};
static int __init sa1111_drv_pcmcia_init(void)

2
drivers/pcmcia/sa1111_jornada720.c
View file

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

8
drivers/pcmcia/vrc4171_card.c
View file

@ -564,7 +564,7 @@ static inline void reserve_using_irq(int slot)
vrc4171_irq_mask &= ~(1 << irq);
}
static int __devinit vrc4171_add_sockets(void)
static int vrc4171_add_sockets(void)
{
vrc4171_socket_t *socket;
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')
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;
@ -746,7 +746,7 @@ static int __devinit vrc4171_card_init(void)
return 0;
}
static void __devexit vrc4171_card_exit(void)
static void vrc4171_card_exit(void)
{
free_irq(vrc4171_irq, vrc4171_sockets);
vrc4171_remove_sockets();

8
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)
{
vrc4173_socket_t *socket;
@ -533,7 +533,7 @@ disable:
return ret;
}
static int __devinit vrc4173_cardu_setup(char *options)
static int vrc4173_cardu_setup(char *options)
{
if (options == NULL || *options == '\0')
return 1;
@ -574,14 +574,14 @@ static struct pci_driver vrc4173_cardu_driver = {
.id_table = vrc4173_cardu_id_table,
};
static int __devinit vrc4173_cardu_init(void)
static int vrc4173_cardu_init(void)
{
vrc4173_cardu_slots = 0;
return pci_register_driver(&vrc4173_cardu_driver);
}
static void __devexit vrc4173_cardu_exit(void)
static void vrc4173_cardu_exit(void)
{
pci_unregister_driver(&vrc4173_cardu_driver);
}

6
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,
};
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 resource *r;
@ -299,7 +299,7 @@ out0:
return ret;
}
static int __devexit xxs1500_pcmcia_remove(struct platform_device *pdev)
static int xxs1500_pcmcia_remove(struct platform_device *pdev)
{
struct xxs1500_pcmcia_sock *sock = platform_get_drvdata(pdev);
@ -317,7 +317,7 @@ static struct platform_driver xxs1500_pcmcia_socket_driver = {
.owner = THIS_MODULE,
},
.probe = xxs1500_pcmcia_probe,
.remove = __devexit_p(xxs1500_pcmcia_remove),
.remove = xxs1500_pcmcia_remove,
};
module_platform_driver(xxs1500_pcmcia_socket_driver);

6
drivers/pcmcia/yenta_socket.c
View file

@ -783,7 +783,7 @@ static void yenta_free_resources(struct yenta_socket *socket)
/*
* Close it down - release our resources and go home..
*/
static void __devexit yenta_close(struct pci_dev *dev)
static void yenta_close(struct pci_dev *dev)
{
struct yenta_socket *sock = pci_get_drvdata(dev);
@ -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
* 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;
int ret;
@ -1435,7 +1435,7 @@ static struct pci_driver yenta_cardbus_driver = {
.name = "yenta_cardbus",
.id_table = yenta_table,
.probe = yenta_probe,
.remove = __devexit_p(yenta_close),
.remove = yenta_close,
.driver.pm = YENTA_PM_OPS,
};