Commit cf4abfcc authored by Russell King's avatar Russell King
Browse files

MFD: mcp-core: remove legacy driver suspend/resume methods 



The legacy driver suspend/resume methods are no longer used, so get rid
of them.

Acked-by: default avatarJochen Friedrich <jochen@scram.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5a09b712

drivers/mfd/mcp-core.c

+0 −28
Original line number Diff line number Diff line
@@ -47,39 +47,11 @@ static int mcp_bus_remove(struct device *dev) 
	return 0;

}



static int mcp_bus_suspend(struct device *dev, pm_message_t state)

{

	struct mcp *mcp = to_mcp(dev);

	int ret = 0;



	if (dev->driver) {

		struct mcp_driver *drv = to_mcp_driver(dev->driver);



		ret = drv->suspend(mcp, state);

	}

	return ret;

}



static int mcp_bus_resume(struct device *dev)

{

	struct mcp *mcp = to_mcp(dev);

	int ret = 0;



	if (dev->driver) {

		struct mcp_driver *drv = to_mcp_driver(dev->driver);



		ret = drv->resume(mcp);

	}

	return ret;

}



static struct bus_type mcp_bus_type = {

	.name		= "mcp",

	.match		= mcp_bus_match,

	.probe		= mcp_bus_probe,

	.remove		= mcp_bus_remove,

	.suspend	= mcp_bus_suspend,

	.resume		= mcp_bus_resume,

};



/**

include/linux/mfd/mcp.h

+0 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ struct mcp_driver { 
	struct device_driver drv;

	int (*probe)(struct mcp *);

	void (*remove)(struct mcp *);

	int (*suspend)(struct mcp *, pm_message_t);

	int (*resume)(struct mcp *);

};



int mcp_driver_register(struct mcp_driver *);