Message ID | 20220118075616.925855-1-chi.minghao@zte.com.cn (mailing list archive) |
---|---|
State | Rejected |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | sfc/ef10: remove unneeded rc variable | expand |
On Tue, Jan 18, 2022 at 07:56:16AM +0000, cgel.zte@gmail.com wrote: > From: Minghao Chi <chi.minghao@zte.com.cn> > > Return value from efx_mcdi_rpc() directly instead > of taking this in another redundant variable. > > Reported-by: Zeal Robot <zealci@zte.com.cn> > Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn> > Signed-off-by: CGEL ZTE <cgel.zte@gmail.com> > --- > drivers/net/ethernet/sfc/ef10.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c > index cf366ed2557c..991758292b7c 100644 > --- a/drivers/net/ethernet/sfc/ef10.c > +++ b/drivers/net/ethernet/sfc/ef10.c > @@ -3627,7 +3627,6 @@ static int efx_ef10_rx_disable_timestamping(struct efx_channel *channel, > bool temp) > { > MCDI_DECLARE_BUF(inbuf, MC_CMD_PTP_IN_TIME_EVENT_UNSUBSCRIBE_LEN); > - int rc; > > if (channel->sync_events_state == SYNC_EVENTS_DISABLED || > (temp && channel->sync_events_state == SYNC_EVENTS_QUIESCENT)) > @@ -3646,10 +3645,8 @@ static int efx_ef10_rx_disable_timestamping(struct efx_channel *channel, > MCDI_SET_DWORD(inbuf, PTP_IN_TIME_EVENT_UNSUBSCRIBE_QUEUE, > channel->channel); > > - rc = efx_mcdi_rpc(channel->efx, MC_CMD_PTP, > + return efx_mcdi_rpc(channel->efx, MC_CMD_PTP, > inbuf, sizeof(inbuf), NULL, 0, NULL); Looks good, but indent the continuation line to align with the ( above it. This sort of cleanup is for net-next, which is closed at the moment. See https://www.kernel.org/doc/Documentation/networking/netdev-FAQ.txt Martin > - > - return rc; > } > > static int efx_ef10_ptp_set_ts_sync_events(struct efx_nic *efx, bool en, > -- > 2.25.1
diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c index cf366ed2557c..991758292b7c 100644 --- a/drivers/net/ethernet/sfc/ef10.c +++ b/drivers/net/ethernet/sfc/ef10.c @@ -3627,7 +3627,6 @@ static int efx_ef10_rx_disable_timestamping(struct efx_channel *channel, bool temp) { MCDI_DECLARE_BUF(inbuf, MC_CMD_PTP_IN_TIME_EVENT_UNSUBSCRIBE_LEN); - int rc; if (channel->sync_events_state == SYNC_EVENTS_DISABLED || (temp && channel->sync_events_state == SYNC_EVENTS_QUIESCENT)) @@ -3646,10 +3645,8 @@ static int efx_ef10_rx_disable_timestamping(struct efx_channel *channel, MCDI_SET_DWORD(inbuf, PTP_IN_TIME_EVENT_UNSUBSCRIBE_QUEUE, channel->channel); - rc = efx_mcdi_rpc(channel->efx, MC_CMD_PTP, + return efx_mcdi_rpc(channel->efx, MC_CMD_PTP, inbuf, sizeof(inbuf), NULL, 0, NULL); - - return rc; } static int efx_ef10_ptp_set_ts_sync_events(struct efx_nic *efx, bool en,