Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97c24d1d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  mmc: remove unused "ddr" parameter in struct mmc_ios
  mmc: dw_mmc: Fix DDR mode support.
  mmc: core: use defined R1_STATE_PRG macro for card status
  mmc: sdhci: use f_max instead of host->clock for timeouts
  mmc: sdhci: move timeout_clk calculation farther down
  mmc: sdhci: check host->clock before using it as a denominator
  mmc: Revert "mmc: sdhci: Fix SDHCI_QUIRK_TIMEOUT_USES_SDCLK"
  mmc: tmio: eliminate unused variable 'mmc' warning
  mmc: esdhc-imx: fix card interrupt loss on freescale eSDHC
  mmc: sdhci-s3c: Fix build for header change
  mmc: dw_mmc: Fix mask in IDMAC_SET_BUFFER1_SIZE macro
  mmc: cb710: fix possible pci_dev leak in cb710_pci_configure()
  mmc: core: Detect eMMC v4.5 ext_csd entries
  mmc: mmc_test: avoid stalled file in debugfs
  mmc: sdhci-s3c: add BROKEN_ADMA_ZEROLEN_DESC quirk
  mmc: sdhci: pxav3: controller needs 32 bit ADMA addressing
  mmc: sdhci: fix retuning timer wrongly deleted in sdhci_tasklet_finish
parents 91d85ea6 7fd781e8

drivers/misc/cb710/core.c

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ EXPORT_SYMBOL_GPL(cb710_pci_update_config_reg); 
static int __devinit cb710_pci_configure(struct pci_dev *pdev)

{

	unsigned int devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);

	struct pci_dev *pdev0 = pci_get_slot(pdev->bus, devfn);

	struct pci_dev *pdev0;

	u32 val;



	cb710_pci_update_config_reg(pdev, 0x48,
@@ -43,6 +43,7 @@ static int __devinit cb710_pci_configure(struct pci_dev *pdev) 
	if (val & 0x80000000)

		return 0;



	pdev0 = pci_get_slot(pdev->bus, devfn);

	if (!pdev0)

		return -ENODEV;

drivers/mmc/card/mmc_test.c

+31 −27
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static void mmc_test_prepare_mrq(struct mmc_test_card *test, 
static int mmc_test_busy(struct mmc_command *cmd)

{

	return !(cmd->resp[0] & R1_READY_FOR_DATA) ||

		(R1_CURRENT_STATE(cmd->resp[0]) == 7);

		(R1_CURRENT_STATE(cmd->resp[0]) == R1_STATE_PRG);

}



/*
@@ -2900,7 +2900,7 @@ static const struct file_operations mmc_test_fops_testlist = { 
	.release	= single_release,

};



static void mmc_test_free_file_test(struct mmc_card *card)

static void mmc_test_free_dbgfs_file(struct mmc_card *card)

{

	struct mmc_test_dbgfs_file *df, *dfs;
@@ -2917,34 +2917,21 @@ static void mmc_test_free_file_test(struct mmc_card *card) 
	mutex_unlock(&mmc_test_lock);

}



static int mmc_test_register_file_test(struct mmc_card *card)

static int __mmc_test_register_dbgfs_file(struct mmc_card *card,

	const char *name, mode_t mode, const struct file_operations *fops)

{

	struct dentry *file = NULL;

	struct mmc_test_dbgfs_file *df;

	int ret = 0;



	mutex_lock(&mmc_test_lock);



	if (card->debugfs_root)

		file = debugfs_create_file("test", S_IWUSR | S_IRUGO,

			card->debugfs_root, card, &mmc_test_fops_test);



	if (IS_ERR_OR_NULL(file)) {

		dev_err(&card->dev,

			"Can't create test. Perhaps debugfs is disabled.\n");

		ret = -ENODEV;

		goto err;

	}



	if (card->debugfs_root)

		file = debugfs_create_file("testlist", S_IRUGO,

			card->debugfs_root, card, &mmc_test_fops_testlist);

		file = debugfs_create_file(name, mode, card->debugfs_root,

			card, fops);



	if (IS_ERR_OR_NULL(file)) {

		dev_err(&card->dev,

			"Can't create testlist. Perhaps debugfs is disabled.\n");

		ret = -ENODEV;

		goto err;

			"Can't create %s. Perhaps debugfs is disabled.\n",

			name);

		return -ENODEV;

	}



	df = kmalloc(sizeof(struct mmc_test_dbgfs_file), GFP_KERNEL);
@@ -2952,14 +2939,31 @@ static int mmc_test_register_file_test(struct mmc_card *card) 
		debugfs_remove(file);

		dev_err(&card->dev,

			"Can't allocate memory for internal usage.\n");

		ret = -ENOMEM;

		goto err;

		return -ENOMEM;

	}



	df->card = card;

	df->file = file;



	list_add(&df->link, &mmc_test_file_test);

	return 0;

}



static int mmc_test_register_dbgfs_file(struct mmc_card *card)

{

	int ret;



	mutex_lock(&mmc_test_lock);



	ret = __mmc_test_register_dbgfs_file(card, "test", S_IWUSR | S_IRUGO,

		&mmc_test_fops_test);

	if (ret)

		goto err;



	ret = __mmc_test_register_dbgfs_file(card, "testlist", S_IRUGO,

		&mmc_test_fops_testlist);

	if (ret)

		goto err;



err:

	mutex_unlock(&mmc_test_lock);
@@ -2974,7 +2978,7 @@ static int mmc_test_probe(struct mmc_card *card) 
	if (!mmc_card_mmc(card) && !mmc_card_sd(card))

		return -ENODEV;



	ret = mmc_test_register_file_test(card);

	ret = mmc_test_register_dbgfs_file(card);

	if (ret)

		return ret;
@@ -2986,7 +2990,7 @@ static int mmc_test_probe(struct mmc_card *card) 
static void mmc_test_remove(struct mmc_card *card)

{

	mmc_test_free_result(card);

	mmc_test_free_file_test(card);

	mmc_test_free_dbgfs_file(card);

}



static struct mmc_driver mmc_driver = {
@@ -3006,7 +3010,7 @@ static void __exit mmc_test_exit(void) 
{

	/* Clear stalled data if card is still plugged */

	mmc_test_free_result(NULL);

	mmc_test_free_file_test(NULL);

	mmc_test_free_dbgfs_file(NULL);



	mmc_unregister_driver(&mmc_driver);

}

drivers/mmc/core/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1502,7 +1502,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from, 
			goto out;

		}

	} while (!(cmd.resp[0] & R1_READY_FOR_DATA) ||

		 R1_CURRENT_STATE(cmd.resp[0]) == 7);

		 R1_CURRENT_STATE(cmd.resp[0]) == R1_STATE_PRG);

out:

	return err;

}

drivers/mmc/core/mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd) 
	}



	card->ext_csd.rev = ext_csd[EXT_CSD_REV];

	if (card->ext_csd.rev > 5) {

	if (card->ext_csd.rev > 6) {

		printk(KERN_ERR "%s: unrecognised EXT_CSD revision %d\n",

			mmc_hostname(card->host), card->ext_csd.rev);

		err = -EINVAL;

drivers/mmc/core/mmc_ops.c

+1 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, 
			break;

		if (mmc_host_is_spi(card->host))

			break;

	} while (R1_CURRENT_STATE(status) == 7);

	} while (R1_CURRENT_STATE(status) == R1_STATE_PRG);



	if (mmc_host_is_spi(card->host)) {

		if (status & R1_SPI_ILLEGAL_COMMAND)