mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 18:11:56 +00:00
32aaeffbd4
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
Revert "tracing: Include module.h in define_trace.h"
irq: don't put module.h into irq.h for tracking irqgen modules.
bluetooth: macroize two small inlines to avoid module.h
ip_vs.h: fix implicit use of module_get/module_put from module.h
nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
include: replace linux/module.h with "struct module" wherever possible
include: convert various register fcns to macros to avoid include chaining
crypto.h: remove unused crypto_tfm_alg_modname() inline
uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
pm_runtime.h: explicitly requires notifier.h
linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
miscdevice.h: fix up implicit use of lists and types
stop_machine.h: fix implicit use of smp.h for smp_processor_id
of: fix implicit use of errno.h in include/linux/of.h
of_platform.h: delete needless include <linux/module.h>
acpi: remove module.h include from platform/aclinux.h
miscdevice.h: delete unnecessary inclusion of module.h
device_cgroup.h: delete needless include <linux/module.h>
net: sch_generic remove redundant use of <linux/module.h>
net: inet_timewait_sock doesnt need <linux/module.h>
...
Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
- drivers/media/dvb/frontends/dibx000_common.c
- drivers/media/video/{mt9m111.c,ov6650.c}
- drivers/mfd/ab3550-core.c
- include/linux/dmaengine.h
59 lines
1.4 KiB
C
59 lines
1.4 KiB
C
/* linux/arch/arm/plat-samsung/platformdata.c
|
|
*
|
|
* Copyright 2010 Ben Dooks <ben-linux <at> fluff.org>
|
|
*
|
|
* Helper for platform data setting
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/string.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
#include <plat/devs.h>
|
|
#include <plat/sdhci.h>
|
|
|
|
void __init *s3c_set_platdata(void *pd, size_t pdsize,
|
|
struct platform_device *pdev)
|
|
{
|
|
void *npd;
|
|
|
|
if (!pd) {
|
|
/* too early to use dev_name(), may not be registered */
|
|
printk(KERN_ERR "%s: no platform data supplied\n", pdev->name);
|
|
return NULL;
|
|
}
|
|
|
|
npd = kmemdup(pd, pdsize, GFP_KERNEL);
|
|
if (!npd) {
|
|
printk(KERN_ERR "%s: cannot clone platform data\n", pdev->name);
|
|
return NULL;
|
|
}
|
|
|
|
pdev->dev.platform_data = npd;
|
|
return npd;
|
|
}
|
|
|
|
void s3c_sdhci_set_platdata(struct s3c_sdhci_platdata *pd,
|
|
struct s3c_sdhci_platdata *set)
|
|
{
|
|
set->cd_type = pd->cd_type;
|
|
set->ext_cd_init = pd->ext_cd_init;
|
|
set->ext_cd_cleanup = pd->ext_cd_cleanup;
|
|
set->ext_cd_gpio = pd->ext_cd_gpio;
|
|
set->ext_cd_gpio_invert = pd->ext_cd_gpio_invert;
|
|
|
|
if (pd->max_width)
|
|
set->max_width = pd->max_width;
|
|
if (pd->cfg_gpio)
|
|
set->cfg_gpio = pd->cfg_gpio;
|
|
if (pd->host_caps)
|
|
set->host_caps |= pd->host_caps;
|
|
if (pd->clk_type)
|
|
set->clk_type = pd->clk_type;
|
|
}
|