Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Dragan Cvetic <draganc@xilinx.com>
To:     Luc Van Oostenryck <luc.vanoostenryck@gmail.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Derek Kiernan <dkiernan@xilinx.com>
Subject: RE: [PATCH] misc: xilinx_sdfec: fix xsdfec_poll()'s return type
Thread-Topic: [PATCH] misc: xilinx_sdfec: fix xsdfec_poll()'s return type
Thread-Index: AQHVnzbvRwd5Ss/ZH0ugJQL96aPqOKeUNshQ
Date:   Wed, 20 Nov 2019 15:59:24 +0000
Message-ID: <CH2PR02MB6359CE45D06E908634CDA855CB4F0@CH2PR02MB6359.namprd02.prod.outlook.com>
References: <20191120001030.30779-1-luc.vanoostenryck@gmail.com>
In-Reply-To: <20191120001030.30779-1-luc.vanoostenryck@gmail.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: xilinx.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: b612d33f-ceb9-4e8f-a66d-08d76dd29da3
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Nov 2019 15:59:24.9863
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 657af505-d5df-48d0-8300-c31994686c5c
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 76Db1XvxDRT0LD7bpXMibBdwjtv0mIl9yBmZ9oYj9OJeSTCFNJKaoCEg7KD32abpp2J4MEeIJp3Ctqs9RP7r9g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR02MB6456
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Luc,

For the sake of my understanding I'd like to ask you when the .pole method =
is defined=20
Why I'm asking this? I have a fairly new book (published in 2017) which sug=
gests what is implemented in SDFEC driver.

I'll test your suggestions and will come back to you soon.

Regards
Dragan


> -----Original Message-----
> From: Luc Van Oostenryck [mailto:luc.vanoostenryck@gmail.com]
> Sent: Wednesday 20 November 2019 00:11
> To: linux-kernel@vger.kernel.org
> Cc: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>; Derek Kiernan <dkie=
rnan@xilinx.com>; Dragan Cvetic
> <draganc@xilinx.com>
> Subject: [PATCH] misc: xilinx_sdfec: fix xsdfec_poll()'s return type
>=20
> xsdfec_poll() is defined as returning 'unsigned int' but the
> .poll method is declared as returning '__poll_t', a bitwise type.
>=20
> Fix this by using the proper return type and using the EPOLL
> constants instead of the POLL ones, as required for __poll_t.
>=20
> CC: Derek Kiernan <derek.kiernan@xilinx.com>
> CC: Dragan Cvetic <dragan.cvetic@xilinx.com>
> Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
> ---
>  drivers/misc/xilinx_sdfec.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>=20
> diff --git a/drivers/misc/xilinx_sdfec.c b/drivers/misc/xilinx_sdfec.c
> index 11835969e982..48ba7e02bed7 100644
> --- a/drivers/misc/xilinx_sdfec.c
> +++ b/drivers/misc/xilinx_sdfec.c
> @@ -1025,25 +1025,25 @@ static long xsdfec_dev_compat_ioctl(struct file *=
file, unsigned int cmd,
>  }
>  #endif
>=20
> -static unsigned int xsdfec_poll(struct file *file, poll_table *wait)
> +static __poll_t xsdfec_poll(struct file *file, poll_table *wait)
>  {
> -	unsigned int mask =3D 0;
> +	__poll_t mask =3D 0;
>  	struct xsdfec_dev *xsdfec;
>=20
>  	xsdfec =3D container_of(file->private_data, struct xsdfec_dev, miscdev)=
;
>=20
>  	if (!xsdfec)
> -		return POLLNVAL | POLLHUP;
> +		return EPOLLNVAL | EPOLLHUP;
>=20
>  	poll_wait(file, &xsdfec->waitq, wait);
>=20
>  	/* XSDFEC ISR detected an error */
>  	spin_lock_irqsave(&xsdfec->error_data_lock, xsdfec->flags);
>  	if (xsdfec->state_updated)
> -		mask |=3D POLLIN | POLLPRI;
> +		mask |=3D EPOLLIN | EPOLLPRI;
>=20
>  	if (xsdfec->stats_updated)
> -		mask |=3D POLLIN | POLLRDNORM;
> +		mask |=3D EPOLLIN | EPOLLRDNORM;
>  	spin_unlock_irqrestore(&xsdfec->error_data_lock, xsdfec->flags);
>=20
>  	return mask;
> --
> 2.24.0