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

Commit 06b0a9a4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fbadadd9 a0c7d833

drivers/net/can/at91_can.c

+1 −1
Original line number Diff line number Diff line
@@ -1347,7 +1347,7 @@ static int at91_can_probe(struct platform_device *pdev) 
	priv->reg_base = addr;

	priv->devtype_data = *devtype_data;

	priv->clk = clk;

	priv->pdata = pdev->dev.platform_data;

	priv->pdata = dev_get_platdata(&pdev->dev);

	priv->mb0_id = 0x7ff;



	netif_napi_add(dev, &priv->napi, at91_poll, get_mb_rx_num(priv));

drivers/net/can/bfin_can.c

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ static int bfin_can_probe(struct platform_device *pdev) 
	struct resource *res_mem, *rx_irq, *tx_irq, *err_irq;

	unsigned short *pdata;



	pdata = pdev->dev.platform_data;

	pdata = dev_get_platdata(&pdev->dev);

	if (!pdata) {

		dev_err(&pdev->dev, "No platform data provided!\n");

		err = -EINVAL;

drivers/net/can/c_can/c_can_pci.c

+0 −2
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ static int c_can_pci_probe(struct pci_dev *pdev, 
	return 0;



out_free_c_can:

	pci_set_drvdata(pdev, NULL);

	free_c_can_dev(dev);

out_iounmap:

	pci_iounmap(pdev, addr);
@@ -181,7 +180,6 @@ static void c_can_pci_remove(struct pci_dev *pdev) 


	unregister_c_can_dev(dev);



	pci_set_drvdata(pdev, NULL);

	free_c_can_dev(dev);



	pci_iounmap(pdev, priv->base);

drivers/net/can/cc770/cc770_platform.c

+2 −2
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ static int cc770_get_platform_data(struct platform_device *pdev, 
				   struct cc770_priv *priv)

{



	struct cc770_platform_data *pdata = pdev->dev.platform_data;

	struct cc770_platform_data *pdata = dev_get_platdata(&pdev->dev);



	priv->can.clock.freq = pdata->osc_freq;

	if (priv->cpu_interface & CPUIF_DSC)
@@ -203,7 +203,7 @@ static int cc770_platform_probe(struct platform_device *pdev) 


	if (pdev->dev.of_node)

		err = cc770_get_of_node_data(pdev, priv);

	else if (pdev->dev.platform_data)

	else if (dev_get_platdata(&pdev->dev))

		err = cc770_get_platform_data(pdev, priv);

	else

		err = -ENODEV;

drivers/net/can/flexcan.c

+1 −1
Original line number Diff line number Diff line
@@ -1074,7 +1074,7 @@ static int flexcan_probe(struct platform_device *pdev) 
	priv->dev = dev;

	priv->clk_ipg = clk_ipg;

	priv->clk_per = clk_per;

	priv->pdata = pdev->dev.platform_data;

	priv->pdata = dev_get_platdata(&pdev->dev);

	priv->devtype_data = devtype_data;



	priv->reg_xceiver = devm_regulator_get(&pdev->dev, "xceiver");