hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2012-08-10 12:28:57 +02:00
parent a33493775d 59596df640
commit b64456a4fc
7 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-exynos/pm_domains.c
View File

@ -115,7 +115,7 @@ static __init int exynos_pm_dt_parse_domains(void)
} }
#endif /* CONFIG_OF */ #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) struct exynos_pm_domain *pd)
{ {
if (pdev->dev.bus) { if (pdev->dev.bus) {

2
drivers/char/hw_random/omap-rng.c
View File

@ -160,7 +160,7 @@ static int __exit omap_rng_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int omap_rng_suspend(struct device *dev) static int omap_rng_suspend(struct device *dev)
{ {

2
drivers/gpio/gpio-em.c
View File

@ -266,7 +266,7 @@ static int __devinit em_gio_irq_domain_init(struct em_gio_priv *p)
return 0; 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; struct gpio_em_config *pdata = p->pdev->dev.platform_data;

1
drivers/mfd/asic3.c
View File

@ -925,6 +925,7 @@ static int __init asic3_mfd_probe(struct platform_device *pdev,
goto out; goto out;
} }
ret = 0;
if (pdata->leds) { if (pdata->leds) {
int i; int i;

7
drivers/mtd/nand/omap2.c
View File

@ -1245,7 +1245,6 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
goto out_release_mem_region; goto out_release_mem_region;
} else { } else {
struct dma_slave_config cfg; struct dma_slave_config cfg;
int rc;
memset(&cfg, 0, sizeof(cfg)); memset(&cfg, 0, sizeof(cfg));
cfg.src_addr = info->phys_base; 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.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
cfg.src_maxburst = 16; cfg.src_maxburst = 16;
cfg.dst_maxburst = 16; cfg.dst_maxburst = 16;
rc = dmaengine_slave_config(info->dma, &cfg); err = dmaengine_slave_config(info->dma, &cfg);
if (rc) { if (err) {
dev_err(&pdev->dev, "DMA engine slave config failed: %d\n", dev_err(&pdev->dev, "DMA engine slave config failed: %d\n",
rc); err);
goto out_release_mem_region; goto out_release_mem_region;
} }
info->nand.read_buf = omap_read_buf_dma_pref; info->nand.read_buf = omap_read_buf_dma_pref;

2
drivers/spi/spi-s3c64xx.c
View File

@ -826,7 +826,7 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(
struct spi_device *spi) struct spi_device *spi)
{ {
struct s3c64xx_spi_csinfo *cs; struct s3c64xx_spi_csinfo *cs;
struct device_node *slave_np, *data_np; struct device_node *slave_np, *data_np = NULL;
u32 fb_delay = 0; u32 fb_delay = 0;
slave_np = spi->dev.of_node; slave_np = spi->dev.of_node;

2
drivers/usb/host/ohci-omap.c
View File

@ -403,8 +403,6 @@ err0:
static inline void static inline void
usb_hcd_omap_remove (struct usb_hcd *hcd, struct platform_device *pdev) usb_hcd_omap_remove (struct usb_hcd *hcd, struct platform_device *pdev)
{ {
struct ohci_hcd *ohci = hcd_to_ohci (hcd);
usb_remove_hcd(hcd); usb_remove_hcd(hcd);
if (!IS_ERR_OR_NULL(hcd->phy)) { if (!IS_ERR_OR_NULL(hcd->phy)) {
(void) otg_set_host(hcd->phy->otg, 0); (void) otg_set_host(hcd->phy->otg, 0);