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

Commit 874d72c4 authored by Scott Wood's avatar Scott Wood Committed by David Woodhouse
Browse files

mtd: elbc nand: use drvdata to only remove the relevant chip 



Previously the remove method was looping and removing all chips,
which is obviously not the right thing to do — left over from when
the driver was organized differently and that was the remove method for
the entire controller.  This would result in bad things happening if
you have more than one NAND chip, and remove the module.

This also fixes priv->dev to properly point to the chip's device rather than
the controller's.  Until now priv->dev was only used for error/debug prints
(and it's an improvement there), so this shouldn't break anything.

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 9d6367f4

drivers/mtd/nand/fsl_elbc_nand.c

+5 −5
Original line number Diff line number Diff line
@@ -915,7 +915,8 @@ static int __devinit fsl_elbc_nand_probe(struct platform_device *pdev) 
	elbc_fcm_ctrl->chips[bank] = priv;

	priv->bank = bank;

	priv->ctrl = fsl_lbc_ctrl_dev;

	priv->dev = dev;

	priv->dev = &pdev->dev;

	dev_set_drvdata(priv->dev, priv);



	priv->vbase = ioremap(res.start, resource_size(&res));

	if (!priv->vbase) {
@@ -962,11 +963,10 @@ static int __devinit fsl_elbc_nand_probe(struct platform_device *pdev) 


static int fsl_elbc_nand_remove(struct platform_device *pdev)

{

	int i;

	struct fsl_elbc_fcm_ctrl *elbc_fcm_ctrl = fsl_lbc_ctrl_dev->nand;

	for (i = 0; i < MAX_BANKS; i++)

		if (elbc_fcm_ctrl->chips[i])

			fsl_elbc_chip_remove(elbc_fcm_ctrl->chips[i]);

	struct fsl_elbc_mtd *priv = dev_get_drvdata(&pdev->dev);



	fsl_elbc_chip_remove(priv);



	mutex_lock(&fsl_elbc_nand_mutex);

	elbc_fcm_ctrl->counter--;