mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Driver core patches for 3.9-rc1
Here is the big driver core merge for 3.9-rc1
There are two major series here, both of which touch lots of drivers all
over the kernel, and will cause you some merge conflicts:
- add a new function called devm_ioremap_resource() to properly be
able to check return values.
- remove CONFIG_EXPERIMENTAL
If you need me to provide a merged tree to handle these resolutions,
please let me know.
Other than those patches, there's not much here, some minor fixes and
updates.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iEYEABECAAYFAlEmV0cACgkQMUfUDdst+yncCQCfbmnQZju7kzWXk6PjdFuKspT9
weAAoMCzcAtEzzc4LXuUxxG/sXBVBCjW
=yWAQ
-----END PGP SIGNATURE-----
Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core patches from Greg Kroah-Hartman:
"Here is the big driver core merge for 3.9-rc1
There are two major series here, both of which touch lots of drivers
all over the kernel, and will cause you some merge conflicts:
- add a new function called devm_ioremap_resource() to properly be
able to check return values.
- remove CONFIG_EXPERIMENTAL
Other than those patches, there's not much here, some minor fixes and
updates"
Fix up trivial conflicts
* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
base: memory: fix soft/hard_offline_page permissions
drivercore: Fix ordering between deferred_probe and exiting initcalls
backlight: fix class_find_device() arguments
TTY: mark tty_get_device call with the proper const values
driver-core: constify data for class_find_device()
firmware: Ignore abort check when no user-helper is used
firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
firmware: Make user-mode helper optional
firmware: Refactoring for splitting user-mode helper code
Driver core: treat unregistered bus_types as having no devices
watchdog: Convert to devm_ioremap_resource()
thermal: Convert to devm_ioremap_resource()
spi: Convert to devm_ioremap_resource()
power: Convert to devm_ioremap_resource()
mtd: Convert to devm_ioremap_resource()
mmc: Convert to devm_ioremap_resource()
mfd: Convert to devm_ioremap_resource()
media: Convert to devm_ioremap_resource()
iommu: Convert to devm_ioremap_resource()
drm: Convert to devm_ioremap_resource()
...
This commit is contained in:
commit
06991c28f3
378 changed files with 1686 additions and 1880 deletions
|
|
@ -587,16 +587,16 @@ void rtc_update_irq(struct rtc_device *rtc,
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(rtc_update_irq);
|
||||
|
||||
static int __rtc_match(struct device *dev, void *data)
|
||||
static int __rtc_match(struct device *dev, const void *data)
|
||||
{
|
||||
char *name = (char *)data;
|
||||
const char *name = data;
|
||||
|
||||
if (strcmp(dev_name(dev), name) == 0)
|
||||
return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct rtc_device *rtc_class_open(char *name)
|
||||
struct rtc_device *rtc_class_open(const char *name)
|
||||
{
|
||||
struct device *dev;
|
||||
struct rtc_device *rtc = NULL;
|
||||
|
|
|
|||
|
|
@ -486,11 +486,9 @@ static int s3c_rtc_probe(struct platform_device *pdev)
|
|||
return -ENOENT;
|
||||
}
|
||||
|
||||
s3c_rtc_base = devm_request_and_ioremap(&pdev->dev, res);
|
||||
if (s3c_rtc_base == NULL) {
|
||||
dev_err(&pdev->dev, "failed to ioremap memory region\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
s3c_rtc_base = devm_ioremap_resource(&pdev->dev, res);
|
||||
if (IS_ERR(s3c_rtc_base))
|
||||
return PTR_ERR(s3c_rtc_base);
|
||||
|
||||
rtc_clk = devm_clk_get(&pdev->dev, "rtc");
|
||||
if (IS_ERR(rtc_clk)) {
|
||||
|
|
|
|||
|
|
@ -252,9 +252,9 @@ static int snvs_rtc_probe(struct platform_device *pdev)
|
|||
return -ENOMEM;
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
data->ioaddr = devm_request_and_ioremap(&pdev->dev, res);
|
||||
if (!data->ioaddr)
|
||||
return -EADDRNOTAVAIL;
|
||||
data->ioaddr = devm_ioremap_resource(&pdev->dev, res);
|
||||
if (IS_ERR(data->ioaddr))
|
||||
return PTR_ERR(data->ioaddr);
|
||||
|
||||
data->irq = platform_get_irq(pdev, 0);
|
||||
if (data->irq < 0)
|
||||
|
|
|
|||
|
|
@ -385,11 +385,9 @@ static int spear_rtc_probe(struct platform_device *pdev)
|
|||
return status;
|
||||
}
|
||||
|
||||
config->ioaddr = devm_request_and_ioremap(&pdev->dev, res);
|
||||
if (!config->ioaddr) {
|
||||
dev_err(&pdev->dev, "request-ioremap fail\n");
|
||||
return -ENOMEM;
|
||||
}
|
||||
config->ioaddr = devm_ioremap_resource(&pdev->dev, res);
|
||||
if (IS_ERR(config->ioaddr))
|
||||
return PTR_ERR(config->ioaddr);
|
||||
|
||||
config->clk = devm_clk_get(&pdev->dev, NULL);
|
||||
if (IS_ERR(config->clk))
|
||||
|
|
|
|||
|
|
@ -327,11 +327,9 @@ static int tegra_rtc_probe(struct platform_device *pdev)
|
|||
return -EBUSY;
|
||||
}
|
||||
|
||||
info->rtc_base = devm_request_and_ioremap(&pdev->dev, res);
|
||||
if (!info->rtc_base) {
|
||||
dev_err(&pdev->dev, "Unable to request mem region and grab IOs for device.\n");
|
||||
return -EBUSY;
|
||||
}
|
||||
info->rtc_base = devm_ioremap_resource(&pdev->dev, res);
|
||||
if (IS_ERR(info->rtc_base))
|
||||
return PTR_ERR(info->rtc_base);
|
||||
|
||||
info->tegra_rtc_irq = platform_get_irq(pdev, 0);
|
||||
if (info->tegra_rtc_irq <= 0)
|
||||
|
|
|
|||
Loading…
Reference in a new issue