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

Commit 89ff05ec authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

phylib: make local function static 



The following functions are not used directly by any drivers:
    phy_attach_direct
    phy_device_create
    phy_prepare_link
    genphy_config_advert
    genphy_setup_forced
    phy_config_interrupt
    phy_clear_interrypt
    phy_sanitize_settings
    phy_enable_interrupts
    phy_disable_interrupts

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ff2d8d6c

Documentation/networking/phy.txt

+0 −18
Original line number Original line Diff line number Diff line
@@ -177,18 +177,6 @@ Doing it all yourself 
 

 

   A convenience function to print out the PHY status neatly.

   A convenience function to print out the PHY status neatly.





 int phy_clear_interrupt(struct phy_device *phydev);

 int phy_config_interrupt(struct phy_device *phydev, u32 interrupts);

   

   Clear the PHY's interrupt, and configure which ones are allowed,

   respectively.  Currently only supports all on, or all off.

 

 int phy_enable_interrupts(struct phy_device *phydev);

 int phy_disable_interrupts(struct phy_device *phydev);



   Functions which enable/disable PHY interrupts, clearing them

   before and after, respectively.



 int phy_start_interrupts(struct phy_device *phydev);

 int phy_start_interrupts(struct phy_device *phydev);

 int phy_stop_interrupts(struct phy_device *phydev);

 int phy_stop_interrupts(struct phy_device *phydev);
@@ -213,12 +201,6 @@ Doing it all yourself 
   Fills the phydev structure with up-to-date information about the current

   Fills the phydev structure with up-to-date information about the current

   settings in the PHY.

   settings in the PHY.





 void phy_sanitize_settings(struct phy_device *phydev)

   

   Resolves differences between currently desired settings, and

   supported settings for the given PHY device.  Does not make

   the changes in the hardware, though.



 int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);

 int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);

 int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);

 int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);

drivers/net/phy/phy.c

+5 −8
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ EXPORT_SYMBOL(phy_print_status); 
 *

 *

 * Returns 0 on success on < 0 on error.

 * Returns 0 on success on < 0 on error.

 */

 */

int phy_clear_interrupt(struct phy_device *phydev)

static int phy_clear_interrupt(struct phy_device *phydev)

{

{

	int err = 0;

	int err = 0;
@@ -82,7 +82,7 @@ int phy_clear_interrupt(struct phy_device *phydev) 
 *

 *

 * Returns 0 on success on < 0 on error.

 * Returns 0 on success on < 0 on error.

 */

 */

int phy_config_interrupt(struct phy_device *phydev, u32 interrupts)

static int phy_config_interrupt(struct phy_device *phydev, u32 interrupts)

{

{

	int err = 0;

	int err = 0;
@@ -208,7 +208,7 @@ static inline int phy_find_valid(int idx, u32 features) 
 *   duplexes.  Drop down by one in this order:  1000/FULL,

 *   duplexes.  Drop down by one in this order:  1000/FULL,

 *   1000/HALF, 100/FULL, 100/HALF, 10/FULL, 10/HALF.

 *   1000/HALF, 100/FULL, 100/HALF, 10/FULL, 10/HALF.

 */

 */

void phy_sanitize_settings(struct phy_device *phydev)

static void phy_sanitize_settings(struct phy_device *phydev)

{

{

	u32 features = phydev->supported;

	u32 features = phydev->supported;

	int idx;

	int idx;
@@ -223,7 +223,6 @@ void phy_sanitize_settings(struct phy_device *phydev) 
	phydev->speed = settings[idx].speed;

	phydev->speed = settings[idx].speed;

	phydev->duplex = settings[idx].duplex;

	phydev->duplex = settings[idx].duplex;

}

}

EXPORT_SYMBOL(phy_sanitize_settings);





/**

/**

 * phy_ethtool_sset - generic ethtool sset function, handles all the details

 * phy_ethtool_sset - generic ethtool sset function, handles all the details
@@ -532,7 +531,7 @@ static irqreturn_t phy_interrupt(int irq, void *phy_dat) 
 * phy_enable_interrupts - Enable the interrupts from the PHY side

 * phy_enable_interrupts - Enable the interrupts from the PHY side

 * @phydev: target phy_device struct

 * @phydev: target phy_device struct

 */

 */

int phy_enable_interrupts(struct phy_device *phydev)

static int phy_enable_interrupts(struct phy_device *phydev)

{

{

	int err;

	int err;
@@ -545,13 +544,12 @@ int phy_enable_interrupts(struct phy_device *phydev) 




	return err;

	return err;

}

}

EXPORT_SYMBOL(phy_enable_interrupts);





/**

/**

 * phy_disable_interrupts - Disable the PHY interrupts from the PHY side

 * phy_disable_interrupts - Disable the PHY interrupts from the PHY side

 * @phydev: target phy_device struct

 * @phydev: target phy_device struct

 */

 */

int phy_disable_interrupts(struct phy_device *phydev)

static int phy_disable_interrupts(struct phy_device *phydev)

{

{

	int err;

	int err;
@@ -574,7 +572,6 @@ int phy_disable_interrupts(struct phy_device *phydev) 




	return err;

	return err;

}

}

EXPORT_SYMBOL(phy_disable_interrupts);





/**

/**

 * phy_start_interrupts - request and enable interrupts for a PHY device

 * phy_start_interrupts - request and enable interrupts for a PHY device

drivers/net/phy/phy_device.c

+10 −9
Original line number Original line Diff line number Diff line
@@ -57,6 +57,9 @@ extern void mdio_bus_exit(void); 
static LIST_HEAD(phy_fixup_list);

static LIST_HEAD(phy_fixup_list);

static DEFINE_MUTEX(phy_fixup_lock);

static DEFINE_MUTEX(phy_fixup_lock);





static int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,

			     u32 flags, phy_interface_t interface);



/*

/*

 * Creates a new phy_fixup and adds it to the list

 * Creates a new phy_fixup and adds it to the list

 * @bus_id: A string which matches phydev->dev.bus_id (or PHY_ANY_ID)

 * @bus_id: A string which matches phydev->dev.bus_id (or PHY_ANY_ID)
@@ -146,7 +149,8 @@ int phy_scan_fixups(struct phy_device *phydev) 
}

}

EXPORT_SYMBOL(phy_scan_fixups);

EXPORT_SYMBOL(phy_scan_fixups);





struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)

static struct phy_device* phy_device_create(struct mii_bus *bus,

					    int addr, int phy_id)

{

{

	struct phy_device *dev;

	struct phy_device *dev;
@@ -193,7 +197,6 @@ struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id) 




	return dev;

	return dev;

}

}

EXPORT_SYMBOL(phy_device_create);





/**

/**

 * get_phy_id - reads the specified addr for its ID.

 * get_phy_id - reads the specified addr for its ID.
@@ -316,7 +319,7 @@ EXPORT_SYMBOL(phy_find_first); 
 *   If you want to monitor your own link state, don't call

 *   If you want to monitor your own link state, don't call

 *   this function.

 *   this function.

 */

 */

void phy_prepare_link(struct phy_device *phydev,

static void phy_prepare_link(struct phy_device *phydev,

		void (*handler)(struct net_device *))

		void (*handler)(struct net_device *))

{

{

	phydev->adjust_link = handler;

	phydev->adjust_link = handler;
@@ -435,7 +438,7 @@ int phy_init_hw(struct phy_device *phydev) 
 *     the attaching device, and given a callback for link status

 *     the attaching device, and given a callback for link status

 *     change.  The phy_device is returned to the attaching driver.

 *     change.  The phy_device is returned to the attaching driver.

 */

 */

int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,

static int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,

			     u32 flags, phy_interface_t interface)

			     u32 flags, phy_interface_t interface)

{

{

	struct device *d = &phydev->dev;

	struct device *d = &phydev->dev;
@@ -473,7 +476,6 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev, 
	 * (dev_flags and interface) */

	 * (dev_flags and interface) */

	return phy_init_hw(phydev);

	return phy_init_hw(phydev);

}

}

EXPORT_SYMBOL(phy_attach_direct);





/**

/**

 * phy_attach - attach a network device to a particular PHY device

 * phy_attach - attach a network device to a particular PHY device
@@ -540,7 +542,7 @@ EXPORT_SYMBOL(phy_detach); 
 *   what is supported.  Returns < 0 on error, 0 if the PHY's advertisement

 *   what is supported.  Returns < 0 on error, 0 if the PHY's advertisement

 *   hasn't changed, and > 0 if it has changed.

 *   hasn't changed, and > 0 if it has changed.

 */

 */

int genphy_config_advert(struct phy_device *phydev)

static int genphy_config_advert(struct phy_device *phydev)

{

{

	u32 advertise;

	u32 advertise;

	int oldadv, adv;

	int oldadv, adv;
@@ -605,7 +607,6 @@ int genphy_config_advert(struct phy_device *phydev) 




	return changed;

	return changed;

}

}

EXPORT_SYMBOL(genphy_config_advert);





/**

/**

 * genphy_setup_forced - configures/forces speed/duplex from @phydev

 * genphy_setup_forced - configures/forces speed/duplex from @phydev
@@ -615,7 +616,7 @@ EXPORT_SYMBOL(genphy_config_advert); 
 *   to the values in phydev. Assumes that the values are valid.

 *   to the values in phydev. Assumes that the values are valid.

 *   Please see phy_sanitize_settings().

 *   Please see phy_sanitize_settings().

 */

 */

int genphy_setup_forced(struct phy_device *phydev)

static int genphy_setup_forced(struct phy_device *phydev)

{

{

	int err;

	int err;

	int ctl = 0;

	int ctl = 0;

include/linux/phy.h

+0 −12
Original line number Original line Diff line number Diff line
@@ -472,11 +472,7 @@ static inline int phy_write(struct phy_device *phydev, u32 regnum, u16 val) 
int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id);

int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id);

struct phy_device* get_phy_device(struct mii_bus *bus, int addr);

struct phy_device* get_phy_device(struct mii_bus *bus, int addr);

int phy_device_register(struct phy_device *phy);

int phy_device_register(struct phy_device *phy);

int phy_clear_interrupt(struct phy_device *phydev);

int phy_config_interrupt(struct phy_device *phydev, u32 interrupts);

int phy_init_hw(struct phy_device *phydev);

int phy_init_hw(struct phy_device *phydev);

int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,

		u32 flags, phy_interface_t interface);

struct phy_device * phy_attach(struct net_device *dev,

struct phy_device * phy_attach(struct net_device *dev,

		const char *bus_id, u32 flags, phy_interface_t interface);

		const char *bus_id, u32 flags, phy_interface_t interface);

struct phy_device *phy_find_first(struct mii_bus *bus);

struct phy_device *phy_find_first(struct mii_bus *bus);
@@ -492,17 +488,12 @@ void phy_start(struct phy_device *phydev); 
void phy_stop(struct phy_device *phydev);

void phy_stop(struct phy_device *phydev);

int phy_start_aneg(struct phy_device *phydev);

int phy_start_aneg(struct phy_device *phydev);





void phy_sanitize_settings(struct phy_device *phydev);

int phy_stop_interrupts(struct phy_device *phydev);

int phy_stop_interrupts(struct phy_device *phydev);

int phy_enable_interrupts(struct phy_device *phydev);

int phy_disable_interrupts(struct phy_device *phydev);





static inline int phy_read_status(struct phy_device *phydev) {

static inline int phy_read_status(struct phy_device *phydev) {

	return phydev->drv->read_status(phydev);

	return phydev->drv->read_status(phydev);

}

}





int genphy_config_advert(struct phy_device *phydev);

int genphy_setup_forced(struct phy_device *phydev);

int genphy_restart_aneg(struct phy_device *phydev);

int genphy_restart_aneg(struct phy_device *phydev);

int genphy_config_aneg(struct phy_device *phydev);

int genphy_config_aneg(struct phy_device *phydev);

int genphy_update_link(struct phy_device *phydev);

int genphy_update_link(struct phy_device *phydev);
@@ -511,8 +502,6 @@ int genphy_suspend(struct phy_device *phydev); 
int genphy_resume(struct phy_device *phydev);

int genphy_resume(struct phy_device *phydev);

void phy_driver_unregister(struct phy_driver *drv);

void phy_driver_unregister(struct phy_driver *drv);

int phy_driver_register(struct phy_driver *new_driver);

int phy_driver_register(struct phy_driver *new_driver);

void phy_prepare_link(struct phy_device *phydev,

		void (*adjust_link)(struct net_device *));

void phy_state_machine(struct work_struct *work);

void phy_state_machine(struct work_struct *work);

void phy_start_machine(struct phy_device *phydev,

void phy_start_machine(struct phy_device *phydev,

		void (*handler)(struct net_device *));

		void (*handler)(struct net_device *));
@@ -523,7 +512,6 @@ int phy_mii_ioctl(struct phy_device *phydev, 
		struct ifreq *ifr, int cmd);

		struct ifreq *ifr, int cmd);

int phy_start_interrupts(struct phy_device *phydev);

int phy_start_interrupts(struct phy_device *phydev);

void phy_print_status(struct phy_device *phydev);

void phy_print_status(struct phy_device *phydev);

struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id);

void phy_device_free(struct phy_device *phydev);

void phy_device_free(struct phy_device *phydev);





int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,

int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,