Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   "Ardelean, Alexandru" <alexandru.Ardelean@analog.com>
To:     Ioana Ciornei <ciorneiioana@gmail.com>,
        Andrew Lunn <andrew@lunn.ch>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Jakub Kicinski <kuba@kernel.org>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Ioana Ciornei <ioana.ciornei@nxp.com>
Subject: RE: [PATCH RESEND net-next 18/18] net: phy: adin: remove the use of
 the .ack_interrupt()
Thread-Topic: [PATCH RESEND net-next 18/18] net: phy: adin: remove the use of
 the .ack_interrupt()
Thread-Index: AQHWud19di6aQp9XSkuIxRZWvSjDaqnHLcFA
Date:   Sat, 14 Nov 2020 06:38:34 +0000
Message-ID: <DM6PR03MB4411FA9CAF9B17710C2AC054F9E50@DM6PR03MB4411.namprd03.prod.outlook.com>
References: <20201113165226.561153-1-ciorneiioana@gmail.com>
 <20201113165226.561153-19-ciorneiioana@gmail.com>
In-Reply-To: <20201113165226.561153-19-ciorneiioana@gmail.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 426da51a-92f1-4c72-1108-08d88867e903
X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Nov 2020 06:38:34.3697
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: eaa689b4-8f87-40e0-9c6f-7228de4d754a
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: SMEN962COI7BdFz5wcsf7OtRBn9DbuJDzDAwTE/yQBKFXaOdDJE1Cl7MqO7WlEyc6Cb0hSHyVK0ensQXH+yyw9ubOk2B9kz9R6b25Vv/eJY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR03MB2523
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.312,18.0.737
 definitions=2020-11-14_01:2020-11-13,2020-11-14 signatures=0
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 mlxscore=0
 priorityscore=1501 suspectscore=0 impostorscore=0 lowpriorityscore=0
 bulkscore=0 clxscore=1015 spamscore=0 adultscore=0 mlxlogscore=999
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2009150000 definitions=main-2011140040
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: Ioana Ciornei <ciorneiioana@gmail.com>
> Sent: Friday, November 13, 2020 6:52 PM
> To: Andrew Lunn <andrew@lunn.ch>; Heiner Kallweit <hkallweit1@gmail.com>;
> Russell King <linux@armlinux.org.uk>; Florian Fainelli <f.fainelli@gmail.=
com>;
> Jakub Kicinski <kuba@kernel.org>; netdev@vger.kernel.org; linux-
> kernel@vger.kernel.org
> Cc: Ioana Ciornei <ioana.ciornei@nxp.com>; Ardelean, Alexandru
> <alexandru.Ardelean@analog.com>
> Subject: [PATCH RESEND net-next 18/18] net: phy: adin: remove the use of =
the
> .ack_interrupt()
>=20
> [External]
>=20
> From: Ioana Ciornei <ioana.ciornei@nxp.com>
>=20
> In preparation of removing the .ack_interrupt() callback, we must replace=
 its
> occurrences (aka phy_clear_interrupt), from the 2 places where it is call=
ed from
> (phy_enable_interrupts and phy_disable_interrupts), with equivalent
> functionality.
>=20
> This means that clearing interrupts now becomes something that the PHY dr=
iver
> is responsible of doing, before enabling interrupts and after clearing th=
em. Make
> this driver follow the new contract.
>=20

Acked-by: Alexandru Ardelean <alexandru.ardelean@analog.com>

> Cc: Alexandru Ardelean <alexandru.ardelean@analog.com>
> Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
> ---
>  drivers/net/phy/adin.c | 25 ++++++++++++++++++-------
>  1 file changed, 18 insertions(+), 7 deletions(-)
>=20
> diff --git a/drivers/net/phy/adin.c b/drivers/net/phy/adin.c index
> ba24434b867d..55a0b91816e2 100644
> --- a/drivers/net/phy/adin.c
> +++ b/drivers/net/phy/adin.c
> @@ -471,12 +471,25 @@ static int adin_phy_ack_intr(struct phy_device
> *phydev)
>=20
>  static int adin_phy_config_intr(struct phy_device *phydev)  {
> -	if (phydev->interrupts =3D=3D PHY_INTERRUPT_ENABLED)
> -		return phy_set_bits(phydev, ADIN1300_INT_MASK_REG,
> -				    ADIN1300_INT_MASK_EN);
> +	int err;
> +
> +	if (phydev->interrupts =3D=3D PHY_INTERRUPT_ENABLED) {
> +		err =3D adin_phy_ack_intr(phydev);
> +		if (err)
> +			return err;
> +
> +		err =3D phy_set_bits(phydev, ADIN1300_INT_MASK_REG,
> +				   ADIN1300_INT_MASK_EN);
> +	} else {
> +		err =3D phy_clear_bits(phydev, ADIN1300_INT_MASK_REG,
> +				     ADIN1300_INT_MASK_EN);
> +		if (err)
> +			return err;
> +
> +		err =3D adin_phy_ack_intr(phydev);
> +	}
>=20
> -	return phy_clear_bits(phydev, ADIN1300_INT_MASK_REG,
> -			      ADIN1300_INT_MASK_EN);
> +	return err;
>  }
>=20
>  static irqreturn_t adin_phy_handle_interrupt(struct phy_device *phydev) =
@@ -
> 895,7 +908,6 @@ static struct phy_driver adin_driver[] =3D {
>  		.read_status	=3D adin_read_status,
>  		.get_tunable	=3D adin_get_tunable,
>  		.set_tunable	=3D adin_set_tunable,
> -		.ack_interrupt	=3D adin_phy_ack_intr,
>  		.config_intr	=3D adin_phy_config_intr,
>  		.handle_interrupt =3D adin_phy_handle_interrupt,
>  		.get_sset_count	=3D adin_get_sset_count,
> @@ -919,7 +931,6 @@ static struct phy_driver adin_driver[] =3D {
>  		.read_status	=3D adin_read_status,
>  		.get_tunable	=3D adin_get_tunable,
>  		.set_tunable	=3D adin_set_tunable,
> -		.ack_interrupt	=3D adin_phy_ack_intr,
>  		.config_intr	=3D adin_phy_config_intr,
>  		.handle_interrupt =3D adin_phy_handle_interrupt,
>  		.get_sset_count	=3D adin_get_sset_count,
> --
> 2.28.0