Commit c6b73489 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

can: m_can: use struct m_can_classdev as drvdata 

The m_can driver's suspend and resume functions (m_can_class_suspend() and
m_can_class_resume()) make use of dev_get_drvdata() and assume that the drvdata
is a pointer to the struct net_device.

With upcoming conversion of the tcan4x5x driver to pm_runtime this assumption
is no longer valid. As the suspend and resume functions actually need a struct
m_can_classdev pointer, change the m_can_platform and the m_can_pci driver to
hold a pointer to struct m_can_classdev instead, as the tcan4x5x driver already
does.

Link: https://lore.kernel.org/r/20201212175518.139651-8-mkl@pengutronix.de


Reviewed-by: default avatarSean Nyekjaer <sean@geanix.com>
Reviewed-by: default avatarDan Murphy <dmurphy@ti.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent ac33ffd3

drivers/net/can/m_can/m_can.c

+4 −4
Original line number Diff line number Diff line
@@ -1859,8 +1859,8 @@ EXPORT_SYMBOL_GPL(m_can_class_unregister); 


int m_can_class_suspend(struct device *dev)

{

	struct net_device *ndev = dev_get_drvdata(dev);

	struct m_can_classdev *cdev = netdev_priv(ndev);

	struct m_can_classdev *cdev = dev_get_drvdata(dev);

	struct net_device *ndev = cdev->net;



	if (netif_running(ndev)) {

		netif_stop_queue(ndev);
@@ -1879,8 +1879,8 @@ EXPORT_SYMBOL_GPL(m_can_class_suspend); 


int m_can_class_resume(struct device *dev)

{

	struct net_device *ndev = dev_get_drvdata(dev);

	struct m_can_classdev *cdev = netdev_priv(ndev);

	struct m_can_classdev *cdev = dev_get_drvdata(dev);

	struct net_device *ndev = cdev->net;



	pinctrl_pm_select_default_state(dev);

drivers/net/can/m_can/m_can_pci.c

+2 −3
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static int m_can_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) 
	mcan_class->can.clock.freq = id->driver_data;

	mcan_class->ops = &m_can_pci_ops;



	pci_set_drvdata(pci, mcan_class->net);

	pci_set_drvdata(pci, mcan_class);



	ret = m_can_class_register(mcan_class);

	if (ret)
@@ -138,8 +138,7 @@ static int m_can_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) 


static void m_can_pci_remove(struct pci_dev *pci)

{

	struct net_device *dev = pci_get_drvdata(pci);

	struct m_can_classdev *mcan_class = netdev_priv(dev);

	struct m_can_classdev *mcan_class = pci_get_drvdata(pci);

	struct m_can_pci_priv *priv = cdev_to_priv(mcan_class);



	pm_runtime_forbid(&pci->dev);

drivers/net/can/m_can/m_can_platform.c

+7 −7
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static int m_can_plat_probe(struct platform_device *pdev) 


	mcan_class->is_peripheral = false;



	platform_set_drvdata(pdev, mcan_class->net);

	platform_set_drvdata(pdev, mcan_class);



	m_can_init_ram(mcan_class);
@@ -143,8 +143,8 @@ static __maybe_unused int m_can_resume(struct device *dev) 


static int m_can_plat_remove(struct platform_device *pdev)

{

	struct net_device *dev = platform_get_drvdata(pdev);

	struct m_can_classdev *mcan_class = netdev_priv(dev);

	struct m_can_plat_priv *priv = platform_get_drvdata(pdev);

	struct m_can_classdev *mcan_class = &priv->cdev;



	m_can_class_unregister(mcan_class);
@@ -155,8 +155,8 @@ static int m_can_plat_remove(struct platform_device *pdev) 


static int __maybe_unused m_can_runtime_suspend(struct device *dev)

{

	struct net_device *ndev = dev_get_drvdata(dev);

	struct m_can_classdev *mcan_class = netdev_priv(ndev);

	struct m_can_plat_priv *priv = dev_get_drvdata(dev);

	struct m_can_classdev *mcan_class = &priv->cdev;



	clk_disable_unprepare(mcan_class->cclk);

	clk_disable_unprepare(mcan_class->hclk);
@@ -166,8 +166,8 @@ static int __maybe_unused m_can_runtime_suspend(struct device *dev) 


static int __maybe_unused m_can_runtime_resume(struct device *dev)

{

	struct net_device *ndev = dev_get_drvdata(dev);

	struct m_can_classdev *mcan_class = netdev_priv(ndev);

	struct m_can_plat_priv *priv = dev_get_drvdata(dev);

	struct m_can_classdev *mcan_class = &priv->cdev;

	int err;



	err = clk_prepare_enable(mcan_class->hclk);