Commit 5c67aa59 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Ulf Hansson
Browse files

mmc: sdhci-pci: Remove dead code (struct sdhci_pci_data et al) 



The last user of this struct gone a couple of releases ago.
Besides that there were not so many users of this API for
more than 10 years:

1/ The one is Intel Merrifield, that had been added 2016-08-31
   by the commit 3976b038 ("x86/platform/intel-mid: Enable
   SD card detection on Merrifield") and removed 2021-02-11 by
   the commit 4590d98f ("sfi: Remove framework for deprecated
   firmware").

2/ The other is Intel Sunrisepoint related, that had been added
   2015-02-06 by the commit e1bfad6d ("mmc: sdhci-pci: Add
   support for drive strength selection for SPT") and removed
   2017-03-20 by the commit 51ced59c ("mmc: sdhci-pci: Use
   ACPI DSM to get driver strength for some Intel devices").

Effectively this is a revert of the commit 52c506f0 ("mmc:
sdhci-pci: add platform data").

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20211014132613.27861-4-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent e087e11c

drivers/mmc/host/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ obj-$(CONFIG_MMC_SDHCI) += sdhci.o 
obj-$(CONFIG_MMC_SDHCI_PCI)	+= sdhci-pci.o

sdhci-pci-y			+= sdhci-pci-core.o sdhci-pci-o2micro.o sdhci-pci-arasan.o \

				   sdhci-pci-dwc-mshc.o sdhci-pci-gli.o

obj-$(subst m,y,$(CONFIG_MMC_SDHCI_PCI))	+= sdhci-pci-data.o

obj-$(CONFIG_MMC_SDHCI_ACPI)	+= sdhci-acpi.o

obj-$(CONFIG_MMC_SDHCI_PXAV3)	+= sdhci-pxav3.o

obj-$(CONFIG_MMC_SDHCI_PXAV2)	+= sdhci-pxav2.o

drivers/mmc/host/sdhci-pci-core.c

+4 −27
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
#include <linux/dma-mapping.h>

#include <linux/slab.h>

#include <linux/device.h>

#include <linux/mmc/host.h>

#include <linux/mmc/mmc.h>

#include <linux/scatterlist.h>

#include <linux/io.h>

#include <linux/iopoll.h>
@@ -26,11 +24,13 @@ 
#include <linux/pm_runtime.h>

#include <linux/pm_qos.h>

#include <linux/debugfs.h>

#include <linux/mmc/slot-gpio.h>

#include <linux/mmc/sdhci-pci-data.h>

#include <linux/acpi.h>

#include <linux/dmi.h>



#include <linux/mmc/host.h>

#include <linux/mmc/mmc.h>

#include <linux/mmc/slot-gpio.h>



#ifdef CONFIG_X86

#include <asm/iosf_mbi.h>

#endif
@@ -2131,22 +2131,6 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot( 
	slot->cd_gpio = -EINVAL;

	slot->cd_idx = -1;



	/* Retrieve platform data if there is any */

	if (*sdhci_pci_get_data)

		slot->data = sdhci_pci_get_data(pdev, slotno);



	if (slot->data) {

		if (slot->data->setup) {

			ret = slot->data->setup(slot->data);

			if (ret) {

				dev_err(&pdev->dev, "platform setup failed\n");

				goto free;

			}

		}

		slot->rst_n_gpio = slot->data->rst_n_gpio;

		slot->cd_gpio = slot->data->cd_gpio;

	}



	host->hw_name = "PCI";

	host->ops = chip->fixes && chip->fixes->ops ?

		    chip->fixes->ops :
@@ -2233,10 +2217,6 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot( 
		chip->fixes->remove_slot(slot, 0);



cleanup:

	if (slot->data && slot->data->cleanup)

		slot->data->cleanup(slot->data);



free:

	sdhci_free_host(host);



	return ERR_PTR(ret);
@@ -2259,9 +2239,6 @@ static void sdhci_pci_remove_slot(struct sdhci_pci_slot *slot) 
	if (slot->chip->fixes && slot->chip->fixes->remove_slot)

		slot->chip->fixes->remove_slot(slot, dead);



	if (slot->data && slot->data->cleanup)

		slot->data->cleanup(slot->data);



	sdhci_free_host(slot->host);

}

drivers/mmc/host/sdhci-pci-data.c

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

#include <linux/module.h>

#include <linux/mmc/sdhci-pci-data.h>



struct sdhci_pci_data *(*sdhci_pci_get_data)(struct pci_dev *pdev, int slotno);

EXPORT_SYMBOL_GPL(sdhci_pci_get_data);

drivers/mmc/host/sdhci-pci.h

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ struct sdhci_pci_fixes { 
struct sdhci_pci_slot {

	struct sdhci_pci_chip	*chip;

	struct sdhci_host	*host;

	struct sdhci_pci_data	*data;



	int			rst_n_gpio;

	int			cd_gpio;

include/linux/mmc/sdhci-pci-data.h

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef LINUX_MMC_SDHCI_PCI_DATA_H

#define LINUX_MMC_SDHCI_PCI_DATA_H



struct pci_dev;



struct sdhci_pci_data {

	struct pci_dev	*pdev;

	int		slotno;

	int		rst_n_gpio; /* Set to -EINVAL if unused */

	int		cd_gpio;    /* Set to -EINVAL if unused */

	int		(*setup)(struct sdhci_pci_data *data);

	void		(*cleanup)(struct sdhci_pci_data *data);

};



extern struct sdhci_pci_data *(*sdhci_pci_get_data)(struct pci_dev *pdev,

				int slotno);

#endif