| Message ID | 1564413872-10720-1-git-send-email-info@metux.net |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | drivers: net: wireless: rsi: return explicit error values | expand |
"Enrico Weigelt, metux IT consult" <info@metux.net> writes: > From: Enrico Weigelt <info@metux.net> > > Explicitly return constants instead of variable (and rely on > it to be explicitly initialized), if the value is supposed > to be fixed anyways. Align it with the rest of the driver, > which does it the same way. > > Signed-off-by: Enrico Weigelt <info@metux.net> > --- > drivers/net/wireless/rsi/rsi_91x_sdio.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) The prefix should be just "rsi:", I'll fix that.
"Enrico Weigelt, metux IT consult" <info@metux.net> wrote: > From: Enrico Weigelt <info@metux.net> > > Explicitly return constants instead of variable (and rely on > it to be explicitly initialized), if the value is supposed > to be fixed anyways. Align it with the rest of the driver, > which does it the same way. > > Signed-off-by: Enrico Weigelt <info@metux.net> Patch applied to wireless-drivers-next.git, thanks. 706f0182b1ad rt2800usb: Add new rt2800usb device PLANEX GW-USMicroN
diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c index b42cd50..2a3577d 100644 --- a/drivers/net/wireless/rsi/rsi_91x_sdio.c +++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c @@ -844,11 +844,11 @@ static int rsi_init_sdio_interface(struct rsi_hw *adapter, struct sdio_func *pfunction) { struct rsi_91x_sdiodev *rsi_91x_dev; - int status = -ENOMEM; + int status; rsi_91x_dev = kzalloc(sizeof(*rsi_91x_dev), GFP_KERNEL); if (!rsi_91x_dev) - return status; + return -ENOMEM; adapter->rsi_dev = rsi_91x_dev; @@ -890,7 +890,7 @@ static int rsi_init_sdio_interface(struct rsi_hw *adapter, #ifdef CONFIG_RSI_DEBUGFS adapter->num_debugfs_entries = MAX_DEBUGFS_ENTRIES; #endif - return status; + return 0; fail: sdio_disable_func(pfunction); sdio_release_host(pfunction);