shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "phy: add cp_test callback"

Browse Source 
This reverts commit 955bb70bf1.

Fix the following changed report by build_abi.sh for GKI

'struct phy_ops at phy.h:56:1' changed:
  type size changed from 512 to 576 (in bits)
  1 data member insertion:
    'int (phy*)* phy_ops::cp_test', at offset 448 (in bits) at phy.h:70:1
  there are data member changes:
    'module* phy_ops::owner' offset changed from 448 to 512 (in bits) (by +64 bits)
  17 impacted interfaces

Change-Id: I5f163b804aaff2fe9c6e3a7c054de3f8df0c791c
Signed-off-by: William Wu <william.wu@rock-chips.com>
This commit is contained in:
William Wu
2020-06-28 11:49:53 +08:00
committed by Tao Huang
parent 4b955357a9
commit 1f056007af
2 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/phy/phy-core.c
View File

@@ -392,21 +392,6 @@ int phy_reset(struct phy *phy)
}
EXPORT_SYMBOL_GPL(phy_reset);
int phy_cp_test(struct phy *phy)
{
int ret;
if (!phy || !phy->ops->cp_test)
return 0;
mutex_lock(&phy->mutex);
ret = phy->ops->cp_test(phy);
mutex_unlock(&phy->mutex);
return ret;
}
EXPORT_SYMBOL_GPL(phy_cp_test);
int phy_calibrate(struct phy *phy)
{
int ret;

10
include/linux/phy/phy.h
View File

@@ -56,7 +56,6 @@ enum phy_mode {
* @set_mode: set the mode of the phy
* @reset: resetting the phy
* @calibrate: calibrate the phy
* @cp_test: prepare for the phy compliance test
* @owner: the module owner containing the ops
*/
struct phy_ops {
@@ -67,7 +66,6 @@ struct phy_ops {
int (*set_mode)(struct phy *phy, enum phy_mode mode);
int (*reset)(struct phy *phy);
int (*calibrate)(struct phy *phy);
int (*cp_test)(struct phy *phy);
struct module *owner;
};
@@ -176,7 +174,6 @@ static inline enum phy_mode phy_get_mode(struct phy *phy)
}
int phy_reset(struct phy *phy);
int phy_calibrate(struct phy *phy);
int phy_cp_test(struct phy *phy);
static inline int phy_get_bus_width(struct phy *phy)
{
return phy->attrs.bus_width;
@@ -303,13 +300,6 @@ static inline int phy_reset(struct phy *phy)
return -ENOSYS;
}
static inline int phy_cp_test(struct phy *phy)
{
if (!phy)
return 0;
return -ENOSYS;
}
static inline int phy_calibrate(struct phy *phy)
{
if (!phy)