[PATCH 11/17] phy: qcom-qmp: drop unused index field

[Neil Armstrong]

On 20/09/2022 09:38, Johan Hovold wrote:
> Only the MSM8996 PCIe QMP driver uses the index field so drop it from
> the other drivers.
> 
> Signed-off-by: Johan Hovold <johan+linaro at kernel.org>
> ---
>   drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 3 ---
>   drivers/phy/qualcomm/phy-qcom-qmp-pcie.c  | 3 ---
>   drivers/phy/qualcomm/phy-qcom-qmp-ufs.c   | 3 ---
>   drivers/phy/qualcomm/phy-qcom-qmp-usb.c   | 3 ---
>   4 files changed, 12 deletions(-)
> 
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
> index 41f938126ff1..08e96e383a29 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
> @@ -906,7 +906,6 @@ struct qmp_phy_combo_cfg {
>    * @pcs_misc: iomapped memory space for lane's pcs_misc
>    * @pcs_usb: iomapped memory space for lane's pcs_usb
>    * @pipe_clk: pipe clock
> - * @index: lane index
>    * @qmp: QMP phy to which this lane belongs
>    * @mode: current PHY mode
>    * @dp_aux_cfg: Display port aux config
> @@ -925,7 +924,6 @@ struct qmp_phy {
>   	void __iomem *pcs_misc;
>   	void __iomem *pcs_usb;
>   	struct clk *pipe_clk;
> -	unsigned int index;
>   	struct qcom_qmp *qmp;
>   	enum phy_mode mode;
>   	unsigned int dp_aux_cfg;
> @@ -2779,7 +2777,6 @@ static int qmp_combo_create(struct device *dev, struct device_node *np, int id,
>   	}
>   
>   	qphy->phy = generic_phy;
> -	qphy->index = id;
>   	qphy->qmp = qmp;
>   	qmp->phys[id] = qphy;
>   	phy_set_drvdata(generic_phy, qphy);
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
> index d22d2cf2fc18..387abed33727 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
> @@ -1371,7 +1371,6 @@ struct qmp_phy_cfg {
>    * @rx2: iomapped memory space for second lane's rx (in dual lane PHYs)
>    * @pcs_misc: iomapped memory space for lane's pcs_misc
>    * @pipe_clk: pipe clock
> - * @index: lane index
>    * @qmp: QMP phy to which this lane belongs
>    */
>   struct qmp_phy {
> @@ -1385,7 +1384,6 @@ struct qmp_phy {
>   	void __iomem *rx2;
>   	void __iomem *pcs_misc;
>   	struct clk *pipe_clk;
> -	unsigned int index;
>   	struct qcom_qmp *qmp;
>   };
>   
> @@ -2264,7 +2262,6 @@ static int qmp_pcie_create(struct device *dev, struct device_node *np, int id,
>   	}
>   
>   	qphy->phy = generic_phy;
> -	qphy->index = id;
>   	qphy->qmp = qmp;
>   	qmp->phys[id] = qphy;
>   	phy_set_drvdata(generic_phy, qphy);
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
> index cc49dec46df4..ca9a42250556 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
> @@ -580,7 +580,6 @@ struct qmp_phy_cfg {
>    * @tx2: iomapped memory space for second lane's tx (in dual lane PHYs)
>    * @rx2: iomapped memory space for second lane's rx (in dual lane PHYs)
>    * @pcs_misc: iomapped memory space for lane's pcs_misc
> - * @index: lane index
>    * @qmp: QMP phy to which this lane belongs
>    */
>   struct qmp_phy {
> @@ -593,7 +592,6 @@ struct qmp_phy {
>   	void __iomem *tx2;
>   	void __iomem *rx2;
>   	void __iomem *pcs_misc;
> -	unsigned int index;
>   	struct qcom_qmp *qmp;
>   };
>   
> @@ -1149,7 +1147,6 @@ static int qmp_ufs_create(struct device *dev, struct device_node *np, int id,
>   	}
>   
>   	qphy->phy = generic_phy;
> -	qphy->index = id;
>   	qphy->qmp = qmp;
>   	qmp->phys[id] = qphy;
>   	phy_set_drvdata(generic_phy, qphy);
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
> index 820062a95211..a34320738f60 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
> @@ -1491,7 +1491,6 @@ struct qmp_phy_cfg {
>    * @pcs_misc: iomapped memory space for lane's pcs_misc
>    * @pcs_usb: iomapped memory space for lane's pcs_usb
>    * @pipe_clk: pipe clock
> - * @index: lane index
>    * @qmp: QMP phy to which this lane belongs
>    * @mode: current PHY mode
>    */
> @@ -1507,7 +1506,6 @@ struct qmp_phy {
>   	void __iomem *pcs_misc;
>   	void __iomem *pcs_usb;
>   	struct clk *pipe_clk;
> -	unsigned int index;
>   	struct qcom_qmp *qmp;
>   	enum phy_mode mode;
>   };
> @@ -2648,7 +2646,6 @@ int qmp_usb_create(struct device *dev, struct device_node *np, int id,
>   	}
>   
>   	qphy->phy = generic_phy;
> -	qphy->index = id;
>   	qphy->qmp = qmp;
>   	qmp->phys[id] = qphy;
>   	phy_set_drvdata(generic_phy, qphy);

Reviewed-by: Neil Armstrong <neil.armstrong at linaro.org>