AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-25 13:20:52 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Fix some various compiler warnings.

Browse Source 
- Make atmel-mci compile again.
 - Fix regression for sdhci-msm.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJTmW+MAAoJEP4mhCVzWIwpexYP/2g28k+T60ezPD6epfum5p/T
 hVNKTI5Ot63WvzDm7u3I73udvHP36bj6RbhwmUPJDY0b6Dh9tm4Od+jiGeUv8Rgt
 q/WN3u9i4ZK2UVkIJFgNoO3gIzEcRJCSxbEYLmofNOzByYgAzzIQbyCd/N8gnEJn
 0/5uv+DN/2OOZ9TukkgQVgmhI+wttDUy5z6ipNBrMbyjASgCysVZxzW1q+IKevfX
 Pym+814qhR4zzTraFoDUpdqIKVI8GcopYF9r2RMUCsvnda6eGEm1hlsDWeh8H9CX
 SixkOzCqeR5yIVLSGBtD/bVmWRbzwYXz1Jr7HiEVilFX15zkUuQGdqw4CDGmJwdR
 NV+U/1uU14IjpW+gkYTxs3oVQql8dn2ZllcScJo44Frhjj6+Z7jIA4uA8TdIS7Hb
 0lDDW1I+zbEhoDwqUabFPG61uNWbII+etTWdAEkJtVhT3HXsYWk8jPpHSOGU4vP3
 8FMF+BkVU3jIH9GnkI1Jl5YD2bESLyu72oZlT9F7qP6ZjDi7NwmN3w3X3xabxAqy
 VuPagGNVmEUmefcLg2CPSC7yPQCyYQrTNVrIM+4eT1q26iQjLpqrIRaHZau5Iptq
 9QV/reqJEYTIoJTxRcZCbTzqlhZAHr5z5aKNHOV/4CHTtUjY9jTe9r8n9yXzejmy
 SSom6g013Ytn2jvPynWk
 =lIlr
 -----END PGP SIGNATURE-----

Merge tag 'mmc-v3.16-2' of git://git.linaro.org/people/ulf.hansson/mmc

Pull MMC fixes from Ulf Hansson:
 "Here are some mmc fixes for 3.16.

   - fix some various compiler warnings
   - make atmel-mci compile again
   - fix regression for sdhci-msm"

* tag 'mmc-v3.16-2' of git://git.linaro.org/people/ulf.hansson/mmc:
  mmc: simplify SDHCI Kconfig dependencies
  mmc: omap: don't select TPS65010
  mmc: mvsdio: avoid compiler warning
  mmc: atmel-mci: incude asm/cacheclush.h
  mmc: sdhci-msm: Fix fallout from sdhci refactoring
  mmc: usdhi6rol0: fix compiler warnings
This commit is contained in:
Linus Torvalds 2014-06-12 12:20:15 -07:00
commit 171c062188
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mmc/host/Kconfig
View File

@ -216,8 +216,7 @@ config MMC_SDHCI_SIRF
config MMC_SDHCI_PXAV3
tristate "Marvell MMP2 SD Host Controller support (PXAV3)"
depends on CLKDEV_LOOKUP
select MMC_SDHCI
select MMC_SDHCI_PLTFM
depends on MMC_SDHCI_PLTFM
default CPU_MMP2
help
This selects the Marvell(R) PXAV3 SD Host Controller.
@ -229,8 +228,7 @@ config MMC_SDHCI_PXAV3
config MMC_SDHCI_PXAV2
tristate "Marvell PXA9XX SD Host Controller support (PXAV2)"
depends on CLKDEV_LOOKUP
select MMC_SDHCI
select MMC_SDHCI_PLTFM
depends on MMC_SDHCI_PLTFM
default CPU_PXA910
help
This selects the Marvell(R) PXAV2 SD Host Controller.
@ -264,7 +262,7 @@ config MMC_SDHCI_S3C_DMA
config MMC_SDHCI_BCM_KONA
tristate "SDHCI support on Broadcom KONA platform"
depends on ARCH_BCM_MOBILE
select MMC_SDHCI_PLTFM
depends on MMC_SDHCI_PLTFM
help
This selects the Broadcom Kona Secure Digital Host Controller
Interface(SDHCI) support.
@ -295,7 +293,7 @@ config MMC_MOXART
config MMC_OMAP
tristate "TI OMAP Multimedia Card Interface support"
depends on ARCH_OMAP
select TPS65010 if MACH_OMAP_H2
depends on TPS65010 || !MACH_OMAP_H2
help
This selects the TI OMAP Multimedia card Interface.
If you have an OMAP board with a Multimedia Card slot,

1
drivers/mmc/host/atmel-mci.c
View File

@ -37,6 +37,7 @@
#include <linux/atmel-mci.h>
#include <linux/atmel_pdc.h>
#include <asm/cacheflush.h>
#include <asm/io.h>
#include <asm/unaligned.h>

2
drivers/mmc/host/mvsdio.c
View File

@ -79,11 +79,11 @@ static int mvsd_setup_data(struct mvsd_host *host, struct mmc_data *data)
unsigned long t = jiffies + HZ;
unsigned int hw_state, count = 0;
do {
hw_state = mvsd_read(MVSD_HW_STATE);
if (time_after(jiffies, t)) {
dev_warn(host->dev, "FIFO_EMPTY bit missing\n");
break;
}
hw_state = mvsd_read(MVSD_HW_STATE);
count++;
} while (!(hw_state & (1 << 13)));
dev_dbg(host->dev, "*** wait for FIFO_EMPTY bit "

4
drivers/mmc/host/sdhci-msm.c
View File

@ -468,6 +468,10 @@ MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match);
static struct sdhci_ops sdhci_msm_ops = {
.platform_execute_tuning = sdhci_msm_execute_tuning,
.reset = sdhci_reset,
.set_clock = sdhci_set_clock,
.set_bus_width = sdhci_set_bus_width,
.set_uhs_signaling = sdhci_set_uhs_signaling,
};
static int sdhci_msm_probe(struct platform_device *pdev)

10
drivers/mmc/host/usdhi6rol0.c
View File

@ -357,7 +357,7 @@ static void *usdhi6_sg_map(struct usdhi6_host *host)
WARN(host->pg.page, "%p not properly unmapped!\n", host->pg.page);
if (WARN(sg_dma_len(sg) % data->blksz,
"SG size %zd isn't a multiple of block size %zd\n",
"SG size %u isn't a multiple of block size %u\n",
sg_dma_len(sg), data->blksz))
return NULL;
@ -459,7 +459,7 @@ static void usdhi6_sg_advance(struct usdhi6_host *host)
done = (host->page_idx << PAGE_SHIFT) + host->offset;
total = host->sg->offset + sg_dma_len(host->sg);
dev_dbg(mmc_dev(host->mmc), "%s(): %zu of %zu @ %u\n", __func__,
dev_dbg(mmc_dev(host->mmc), "%s(): %zu of %zu @ %zu\n", __func__,
done, total, host->offset);
if (done < total && host->offset) {
@ -489,7 +489,7 @@ static void usdhi6_sg_advance(struct usdhi6_host *host)
host->sg = next;
if (WARN(next && sg_dma_len(next) % data->blksz,
"SG size %zd isn't a multiple of block size %zd\n",
"SG size %u isn't a multiple of block size %u\n",
sg_dma_len(next), data->blksz))
data->error = -EINVAL;
@ -896,7 +896,7 @@ static void usdhi6_request_done(struct usdhi6_host *host)
struct mmc_data *data = mrq->data;
if (WARN(host->pg.page || host->head_pg.page,
"Page %p or %p not unmapped: wait %u, CMD%d(%c) @ +0x%x %ux%u in SG%u!\n",
"Page %p or %p not unmapped: wait %u, CMD%d(%c) @ +0x%zx %ux%u in SG%u!\n",
host->pg.page, host->head_pg.page, host->wait, mrq->cmd->opcode,
data ? (data->flags & MMC_DATA_READ ? 'R' : 'W') : '-',
data ? host->offset : 0, data ? data->blocks : 0,
@ -1666,7 +1666,7 @@ static void usdhi6_timeout_work(struct work_struct *work)
case USDHI6_WAIT_FOR_READ:
case USDHI6_WAIT_FOR_WRITE:
dev_dbg(mmc_dev(host->mmc),
"%c: page #%u @ +0x%x %ux%u in SG%u. Current SG %u bytes @ %u\n",
"%c: page #%u @ +0x%zx %ux%u in SG%u. Current SG %u bytes @ %u\n",
data->flags & MMC_DATA_READ ? 'R' : 'W', host->page_idx,
host->offset, data->blocks, data->blksz, data->sg_len,
sg_dma_len(host->sg), host->sg->offset);