anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "net: phylink: add mac_managed_pm in phylink_config structure"

Browse Source 
This reverts commit b9122e0e0e which is
commit 96de900ae78e7dbedc937fd91bafe2934579c65a upstream.

It breaks the kernel api and is not needed at this point in time for
Android devices.  If it is determined to be needed, then it can be
brought back in an abi-safe way in the future.

Bug: 161946584
Change-Id: I14614323da294f4b6313f721934b92946917100f
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2022-12-01 10:54:30 +00:00
parent 8d9f3b2315
commit 92f701cae0
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/phy/phylink.c
View File

@@ -1050,9 +1050,6 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy,
if (phy_interrupt_is_valid(phy))
phy_request_interrupt(phy);
if (pl->config->mac_managed_pm)
phy->mac_managed_pm = true;
return 0;
}

2
include/linux/phylink.h
View File

@@ -64,7 +64,6 @@ enum phylink_op_type {
* @pcs_poll: MAC PCS cannot provide link change interrupt
* @poll_fixed_state: if true, starts link_poll,
* if MAC link is at %MLO_AN_FIXED mode.
* @mac_managed_pm: if true, indicate the MAC driver is responsible for PHY PM.
* @ovr_an_inband: if true, override PCS to MLO_AN_INBAND
* @get_fixed_state: callback to execute to determine the fixed link state,
* if MAC link is at %MLO_AN_FIXED mode.
@@ -74,7 +73,6 @@ struct phylink_config {
enum phylink_op_type type;
bool pcs_poll;
bool poll_fixed_state;
bool mac_managed_pm;
bool ovr_an_inband;
void (*get_fixed_state)(struct phylink_config *config,
struct phylink_link_state *state);