Commit b1b36680 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Jakub Kicinski
Browse files

net: phy: assign default match function for non-PHY MDIO devices 



Make mdio_device_bus_match() the default match function for non-PHY
MDIO devices. Benefit is that we don't have to export this function
any longer. As long as mdiodev->modalias isn't set, there's no change
in behavior. mdiobus_create_device() is the only place where
mdiodev->modalias gets set, but this function sets
mdio_device_bus_match() as match function anyway.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Link: https://patch.msgid.link/6c94e3d3-bfb0-4ddc-a518-6fddbc64e1d0@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8f9fee25

drivers/net/phy/mdio_bus_provider.c

+0 −1
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ static int mdiobus_create_device(struct mii_bus *bus, 


	strscpy(mdiodev->modalias, bi->modalias,

		sizeof(mdiodev->modalias));

	mdiodev->bus_match = mdio_device_bus_match;

	mdiodev->dev.platform_data = (void *)bi->platform_data;



	ret = mdio_device_register(mdiodev);

drivers/net/phy/mdio_device.c

+3 −2
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ static void mdio_device_release(struct device *dev) 
	kfree(to_mdio_device(dev));

}



int mdio_device_bus_match(struct device *dev, const struct device_driver *drv)

static int mdio_device_bus_match(struct device *dev,

				 const struct device_driver *drv)

{

	struct mdio_device *mdiodev = to_mdio_device(dev);

	const struct mdio_driver *mdiodrv = to_mdio_driver(drv);
@@ -45,7 +46,6 @@ int mdio_device_bus_match(struct device *dev, const struct device_driver *drv) 


	return strcmp(mdiodev->modalias, drv->name) == 0;

}

EXPORT_SYMBOL_GPL(mdio_device_bus_match);



struct mdio_device *mdio_device_create(struct mii_bus *bus, int addr)

{
@@ -59,6 +59,7 @@ struct mdio_device *mdio_device_create(struct mii_bus *bus, int addr) 
	mdiodev->dev.release = mdio_device_release;

	mdiodev->dev.parent = &bus->dev;

	mdiodev->dev.bus = &mdio_bus_type;

	mdiodev->bus_match = mdio_device_bus_match;

	mdiodev->device_free = mdio_device_free;

	mdiodev->device_remove = mdio_device_remove;

	mdiodev->bus = bus;

include/linux/mdio.h

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ void mdio_device_remove(struct mdio_device *mdiodev); 
void mdio_device_reset(struct mdio_device *mdiodev, int value);

int mdio_driver_register(struct mdio_driver *drv);

void mdio_driver_unregister(struct mdio_driver *drv);

int mdio_device_bus_match(struct device *dev, const struct device_driver *drv);



static inline void mdio_device_get(struct mdio_device *mdiodev)

{