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

Commit fb766421 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: phy: mdio-gpio: Move allocation for bitbanging data 



Moving the allocation of this structure to the probe function is a
step towards making it the core data structure of the driver.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c82fc481

drivers/net/phy/mdio-gpio.c

+7 −6
Original line number Diff line number Diff line
@@ -115,15 +115,11 @@ static const struct mdiobb_ops mdio_gpio_ops = { 
};



static struct mii_bus *mdio_gpio_bus_init(struct device *dev,

					  struct mdio_gpio_info *bitbang,

					  struct mdio_gpio_platform_data *pdata,

					  int bus_id)

{

	struct mii_bus *new_bus;

	struct mdio_gpio_info *bitbang;



	bitbang = devm_kzalloc(dev, sizeof(*bitbang), GFP_KERNEL);

	if (!bitbang)

		return NULL;



	bitbang->ctrl.ops = &mdio_gpio_ops;

	bitbang->mdc = pdata->mdc;
@@ -165,9 +161,14 @@ static void mdio_gpio_bus_destroy(struct device *dev) 
static int mdio_gpio_probe(struct platform_device *pdev)

{

	struct mdio_gpio_platform_data *pdata;

	struct mdio_gpio_info *bitbang;

	struct mii_bus *new_bus;

	int ret, bus_id;



	bitbang = devm_kzalloc(&pdev->dev, sizeof(*bitbang), GFP_KERNEL);

	if (!bitbang)

		return -ENOMEM;



	if (pdev->dev.of_node) {

		pdata = mdio_gpio_of_get_data(&pdev->dev);

		bus_id = of_alias_get_id(pdev->dev.of_node, "mdio-gpio");
@@ -183,7 +184,7 @@ static int mdio_gpio_probe(struct platform_device *pdev) 
	if (!pdata)

		return -ENODEV;



	new_bus = mdio_gpio_bus_init(&pdev->dev, pdata, bus_id);

	new_bus = mdio_gpio_bus_init(&pdev->dev, bitbang, pdata, bus_id);

	if (!new_bus)

		return -ENODEV;