xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrew Lunn
2018-04-19 01:02:56 +02:00
committed by David S. Miller
parent c82fc4814a
commit fb766421d8
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/phy/mdio-gpio.c
View File

@@ -115,15 +115,11 @@ static const struct mdiobb_ops mdio_gpio_ops = {
}; };
static struct mii_bus *mdio_gpio_bus_init(struct device *dev, static struct mii_bus *mdio_gpio_bus_init(struct device *dev,
struct mdio_gpio_info *bitbang,
struct mdio_gpio_platform_data *pdata, struct mdio_gpio_platform_data *pdata,
int bus_id) int bus_id)
{ {
struct mii_bus *new_bus; 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->ctrl.ops = &mdio_gpio_ops;
bitbang->mdc = pdata->mdc; 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) static int mdio_gpio_probe(struct platform_device *pdev)
{ {
struct mdio_gpio_platform_data *pdata; struct mdio_gpio_platform_data *pdata;
struct mdio_gpio_info *bitbang;
struct mii_bus *new_bus; struct mii_bus *new_bus;
int ret, bus_id; int ret, bus_id;
bitbang = devm_kzalloc(&pdev->dev, sizeof(*bitbang), GFP_KERNEL);
if (!bitbang)
return -ENOMEM;
if (pdev->dev.of_node) { if (pdev->dev.of_node) {
pdata = mdio_gpio_of_get_data(&pdev->dev); pdata = mdio_gpio_of_get_data(&pdev->dev);
bus_id = of_alias_get_id(pdev->dev.of_node, "mdio-gpio"); 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) if (!pdata)
return -ENODEV; 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) if (!new_bus)
return -ENODEV; return -ENODEV;