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

Commit 76a411f9 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Chris Ball
Browse files

mmc: sh_mobile_sdhi: remove unused .pdata field 



The struct sh_mobile_sdhi_info::pdata field was only used for platform-
based card detection and isn't used anymore since the migration to GPIO-
based MMC slot functions. Remove it.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 5a00a971

drivers/mmc/host/sh_mobile_sdhi.c

+0 −4
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) 
	mmc_data = &priv->mmc_data;



	if (p) {

		p->pdata = mmc_data;

		if (p->init) {

			ret = p->init(pdev, &sdhi_ops);

			if (ret)
@@ -310,9 +309,6 @@ static int sh_mobile_sdhi_remove(struct platform_device *pdev) 
	struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;

	int i = 0, irq;



	if (p)

		p->pdata = NULL;



	tmio_mmc_host_remove(host);



	while (1) {

include/linux/mmc/sh_mobile_sdhi.h

+0 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
#include <linux/types.h>



struct platform_device;

struct tmio_mmc_data;



#define SH_MOBILE_SDHI_IRQ_CARD_DETECT	"card_detect"

#define SH_MOBILE_SDHI_IRQ_SDCARD	"sdcard"
@@ -26,7 +25,6 @@ struct sh_mobile_sdhi_info { 
	unsigned long tmio_caps2;

	u32 tmio_ocr_mask;	/* available MMC voltages */

	unsigned int cd_gpio;

	struct tmio_mmc_data *pdata;

	void (*set_pwr)(struct platform_device *pdev, int state);

	int (*get_cd)(struct platform_device *pdev);