LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Michal Simek <michal.simek@xilinx.com>,
Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Cc: Wolfgang Grandegger <wg@grandegger.com>,
Maxime Ripard <maxime.ripard@bootlin.com>,
Chen-Yu Tsai <wens@csie.org>,
"open list:CAN NETWORK DRIVERS" <linux-can@vger.kernel.org>,
"open list:NETWORKING DRIVERS" <netdev@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>,
"moderated list:ARM/Allwinner sunXi SoC support"
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH 3/3] can: xilinx: fix xcan_start_xmit()'s return type
Date: Fri, 27 Apr 2018 09:55:16 +0200 [thread overview]
Message-ID: <02e9be66-1345-2af7-c343-9f94d71e1d10@pengutronix.de> (raw)
In-Reply-To: <79ea4ab6-a12a-21ad-b586-6a1dad176c0a@xilinx.com>
[-- Attachment #1.1: Type: text/plain, Size: 2245 bytes --]
On 04/27/2018 09:49 AM, Michal Simek wrote:
> On 26.4.2018 23:13, Luc Van Oostenryck wrote:
>> The method ndo_start_xmit() is defined as returning an 'netdev_tx_t',
>> which is a typedef for an enum type, but the implementation in this
>> driver returns an 'int'.
>>
>> Fix this by returning 'netdev_tx_t' in this driver too.
>>
>> Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
>> ---
>> drivers/net/can/xilinx_can.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c
>> index 89aec07c2..a19648606 100644
>> --- a/drivers/net/can/xilinx_can.c
>> +++ b/drivers/net/can/xilinx_can.c
>> @@ -386,7 +386,7 @@ static int xcan_do_set_mode(struct net_device *ndev, enum can_mode mode)
>> *
>> * Return: 0 on success and failure value on error
>> */
>> -static int xcan_start_xmit(struct sk_buff *skb, struct net_device *ndev)
>> +static netdev_tx_t xcan_start_xmit(struct sk_buff *skb, struct net_device *ndev)
>> {
>> struct xcan_priv *priv = netdev_priv(ndev);
>> struct net_device_stats *stats = &ndev->stats;
>>
>
> It was applied already but there should be also kernel-doc update too to
> use enum values instead of 0.
Like this:
> diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c
> index f07ce4945356..d0ad1473f689 100644
> --- a/drivers/net/can/xilinx_can.c
> +++ b/drivers/net/can/xilinx_can.c
> @@ -398,7 +398,7 @@ static int xcan_do_set_mode(struct net_device *ndev, enum can_mode mode)
> * function uses the next available free txbuff and populates their fields to
> * start the transmission.
> *
> - * Return: 0 on success and failure value on error
> + * Return: NETDEV_TX_OK on success and NETDEV_TX_BUSY when the tx queue is full
> */
> static netdev_tx_t xcan_start_xmit(struct sk_buff *skb, struct net_device *ndev)
> {
I can squash in that change.
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-04-27 7:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-26 21:13 [PATCH 0/3] can: fix ndo_start_xmit()'s " Luc Van Oostenryck
2018-04-26 21:13 ` [PATCH 1/3] can: janz-ican3: fix ican3_xmit()'s " Luc Van Oostenryck
2018-04-26 21:13 ` [PATCH 2/3] can: sun4i: fix sun4ican_start_xmit()'s " Luc Van Oostenryck
2018-04-26 21:13 ` [PATCH 3/3] can: xilinx: fix xcan_start_xmit()'s " Luc Van Oostenryck
2018-04-27 7:49 ` Michal Simek
2018-04-27 7:55 ` Marc Kleine-Budde [this message]
2018-04-27 8:03 ` Michal Simek
2018-04-27 7:21 ` [PATCH 0/3] can: fix ndo_start_xmit()'s " Marc Kleine-Budde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=02e9be66-1345-2af7-c343-9f94d71e1d10@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luc.vanoostenryck@gmail.com \
--cc=maxime.ripard@bootlin.com \
--cc=michal.simek@xilinx.com \
--cc=netdev@vger.kernel.org \
--cc=wens@csie.org \
--cc=wg@grandegger.com \
--subject='Re: [PATCH 3/3] can: xilinx: fix xcan_start_xmit()'\''s return type' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).