Commit b64456a4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'testing/new-warnings' into fixes 



These patches all fix bugs that were newly introduced in v3.6-rc1
and found because they cause a gcc warning with one of the ARM
defconfigs. Most of them are harmless, but since we're trying
to get rid of all warnings eventually, we can start with the ones
that were not there before.

* testing/new-warnings:
  omap-rng: fix use of SIMPLE_DEV_PM_OPS
  spi/s3c64xx: improve error handling
  mtd/omap2: fix dmaengine_slave_config error handling
  gpio: em: do not discard em_gio_irq_domain_cleanup
  ARM: exynos: exynos_pm_add_dev_to_genpd may be unused
  usb/ohci-omap: remove unused variable
  mfd/asic3: fix asic3_mfd_probe return value

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a3349377 59596df6

arch/arm/mach-exynos/pm_domains.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static __init int exynos_pm_dt_parse_domains(void) 
}

#endif /* CONFIG_OF */



static __init void exynos_pm_add_dev_to_genpd(struct platform_device *pdev,

static __init __maybe_unused void exynos_pm_add_dev_to_genpd(struct platform_device *pdev,

						struct exynos_pm_domain *pd)

{

	if (pdev->dev.bus) {

drivers/char/hw_random/omap-rng.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int __exit omap_rng_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP



static int omap_rng_suspend(struct device *dev)

{

drivers/gpio/gpio-em.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static int __devinit em_gio_irq_domain_init(struct em_gio_priv *p) 
	return 0;

}



static void __devexit em_gio_irq_domain_cleanup(struct em_gio_priv *p)

static void em_gio_irq_domain_cleanup(struct em_gio_priv *p)

{

	struct gpio_em_config *pdata = p->pdev->dev.platform_data;

drivers/mfd/asic3.c

+1 −0
Original line number Diff line number Diff line
@@ -925,6 +925,7 @@ static int __init asic3_mfd_probe(struct platform_device *pdev, 
			goto out;

	}



	ret = 0;

	if (pdata->leds) {

		int i;

drivers/mtd/nand/omap2.c

+3 −4
Original line number Diff line number Diff line
@@ -1245,7 +1245,6 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) 
			goto out_release_mem_region;

		} else {

			struct dma_slave_config cfg;

			int rc;



			memset(&cfg, 0, sizeof(cfg));

			cfg.src_addr = info->phys_base;
@@ -1254,10 +1253,10 @@ static int __devinit omap_nand_probe(struct platform_device *pdev) 
			cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;

			cfg.src_maxburst = 16;

			cfg.dst_maxburst = 16;

			rc = dmaengine_slave_config(info->dma, &cfg);

			if (rc) {

			err = dmaengine_slave_config(info->dma, &cfg);

			if (err) {

				dev_err(&pdev->dev, "DMA engine slave config failed: %d\n",

					rc);

					err);

				goto out_release_mem_region;

			}

			info->nand.read_buf   = omap_read_buf_dma_pref;

CRA Git | Maintained and supported by SUSTech CRA and CCSE