On Tue, Oct 04, 2022 at 06:01:12PM +0200, Ahmad Fatoum wrote: > The patch is wrong and issue is still reproducible with it. We have no > alternate fix yet, but drop the non-functional fix until we do. > > This reverts commit c7428c02d72d1c74295226e7c9483e0f62f6a2aa. > > Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> > --- > Issue is spurious, which suggests to me that it's related to: > https://patchwork.kernel.org/project/linux-arm-kernel/patch/1495126660-25044-1-git-send-email-srinath.mannam@xxxxxxxxxxxx/#20487621 > > Haven't found a proper solution yet though. > --- > drivers/mci/mci-bcm2835.c | 12 ------------ > 1 file changed, 12 deletions(-) Applied, thanks Sascha > > diff --git a/drivers/mci/mci-bcm2835.c b/drivers/mci/mci-bcm2835.c > index c5b226ba033c..f092156f9a83 100644 > --- a/drivers/mci/mci-bcm2835.c > +++ b/drivers/mci/mci-bcm2835.c > @@ -385,8 +385,6 @@ static int bcm2835_mci_probe(struct device_d *hw_dev) > host->sdhci.read32 = bcm2835_sdhci_read32; > host->sdhci.write32 = bcm2835_sdhci_write32; > > - hw_dev->priv = host; > - > mci_of_parse(&host->mci); > > iores = dev_request_mem_resource(hw_dev, 0); > @@ -422,15 +420,6 @@ static int bcm2835_mci_probe(struct device_d *hw_dev) > return mci_register(&host->mci); > } > > -static void bcm2835_mci_remove(struct device_d *dev) > -{ > - struct bcm2835_mci_host *host = dev->priv; > - > - sdhci_write32(&host->sdhci, > - SDHCI_CLOCK_CONTROL__TIMEOUT_CONTROL__SOFTWARE_RESET, > - 0x00); > -} > - > static __maybe_unused struct of_device_id bcm2835_mci_compatible[] = { > { > .compatible = "brcm,bcm2835-sdhci", > @@ -444,7 +433,6 @@ static __maybe_unused struct of_device_id bcm2835_mci_compatible[] = { > static struct driver_d bcm2835_mci_driver = { > .name = "bcm2835_mci", > .probe = bcm2835_mci_probe, > - .remove = bcm2835_mci_remove, > .of_compatible = DRV_OF_COMPAT(bcm2835_mci_compatible), > }; > > -- > 2.30.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
