linux-next: manual merge of the wireless-next tree with the net-next tree
Subsystems (4)
Hi John,
Today's linux-next merge of the wireless-next tree got conflicts in drivers/net/wireless/ti/wlcore/sdio.c and drivers/net/wireless/ti/wlcore/spi.c between commit 0d2e7a5c6080 ("wireless: Remove unnecessary alloc/OOM messages, alloc cleanups") from the net-next tree and commit afb43e6d88e5 ("wlcore: remove if_ops from platform_data") from the wireless-next tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
Signature · 64 lines
Cheers, Stephen Rothwell [email protected] diff --cc drivers/net/wireless/ti/wlcore/sdio.c index 75622f6,198028d..0000000 --- a/drivers/net/wireless/ti/wlcore/sdio.c +++ b/drivers/net/wireless/ti/wlcore/sdio.c @@@ -228,9 -228,19 +228,17 @@@ static int wl1271_probe(struct sdio_fun if (func->num != 0x02) return -ENODEV; + pdev_data = kzalloc(sizeof(*pdev_data), GFP_KERNEL); + if (!pdev_data) { + dev_err(&func->dev, "can't allocate platdev_data\n"); + goto out; + } + + pdev_data->if_ops = &sdio_ops; + glue = kzalloc(sizeof(*glue), GFP_KERNEL); - if (!glue) { - dev_err(&func->dev, "can't allocate glue\n"); + if (!glue) - goto out; + goto out_free_pdev_data; - } glue->dev = &func->dev; diff --cc drivers/net/wireless/ti/wlcore/spi.c index 53790d1,5ad2e10..0000000 --- a/drivers/net/wireless/ti/wlcore/spi.c +++ b/drivers/net/wireless/ti/wlcore/spi.c @@@ -325,17 -331,26 +325,24 @@@ static int wl1271_probe(struct spi_devi struct resource res[1]; int ret = -ENOMEM; - pdata = spi->dev.platform_data; - if (!pdata) { + pdev_data = kzalloc(sizeof(*pdev_data), GFP_KERNEL); + if (!pdev_data) { + dev_err(&spi->dev, "can't allocate platdev_data\n"); + goto out; + } + + pdev_data->pdata = spi->dev.platform_data; + if (!pdev_data->pdata) { dev_err(&spi->dev, "no platform data\n"); - return -ENODEV; + ret = -ENODEV; + goto out_free_pdev_data; } - pdata->ops = &spi_ops; + pdev_data->if_ops = &spi_ops; glue = kzalloc(sizeof(*glue), GFP_KERNEL); - if (!glue) { - dev_err(&spi->dev, "can't allocate glue\n"); + if (!glue) - goto out; + goto out_free_pdev_data; - } glue->dev = &spi->dev;
Quoted 9 lines · Stephen Rothwell
Hi John,
Today's linux-next merge of the wireless-next tree got conflicts in
drivers/net/wireless/ti/wlcore/sdio.canddrivers/net/wireless/ti/wlcore/spi.cbetween commit0d2e7a5c6080("wireless: Remove unnecessary alloc/OOM messages, alloc cleanups") from the net-next tree and commitafb43e6d88e5("wlcore: removeif_opsfromplatform_data") from the wireless-next tree.
Quoted 3 lines
I fixed it up (see below) and can carry the fix as necessary (no action is required).
Thanks Stephen.
Can you remove just the dev_err below too please.
+ pdev_data = kzalloc(sizeof(*pdev_data), GFP_KERNEL);
+ if (!pdev_data) {
+ dev_err(&func->dev, "can't allocate platdev_data\n");
+ goto out;
+ }
Joe
Quoted 10 lines · Joe Perches
Quoted 9 lines · Stephen Rothwell
Hi John,
Today's linux-next merge of the wireless-next tree got conflicts in
drivers/net/wireless/ti/wlcore/sdio.canddrivers/net/wireless/ti/wlcore/spi.cbetween commit0d2e7a5c6080("wireless: Remove unnecessary alloc/OOM messages, alloc cleanups") from the net-next tree and commitafb43e6d88e5("wlcore: removeif_opsfromplatform_data") from the wireless-next tree.
Quoted 3 lines
Quoted 3 lines
I fixed it up (see below) and can carry the fix as necessary (no action is required).
The fix up looks good. Thanks!
Review
Quoted 9 lines
Thanks Stephen.
Can you remove just the
dev_errbelow too please.(quoted diff) +5
-0+ pdev_data = kzalloc(sizeof(*pdev_data), GFP_KERNEL); + if (!pdev_data) { + dev_err(&func->dev, "can't allocate platdev_data\n"); + goto out; + }
Yes, and there's also another one indrivers/net/wireless/ti/wlcore/spi.c:
+ pdev_data = kzalloc(sizeof(*pdev_data), GFP_KERNEL);
+ if (!pdev_data) {
+ dev_err(&spi->dev, "can't allocate platdev_data\n");
+ goto out;
+ }
--
Cheers,
Luca.
Hi all,
Quoted 29 lines · On Mon, 11 Feb 2013 08:47:54 +0200 Luciano Coelho <[email protected]> wrote:
Quoted 11 lines · Joe Perches
Quoted 10 lines · Stephen Rothwell
Today's linux-next merge of the wireless-next tree got conflicts in
drivers/net/wireless/ti/wlcore/sdio.canddrivers/net/wireless/ti/wlcore/spi.cbetween commit0d2e7a5c6080("wireless: Remove unnecessary alloc/OOM messages, alloc cleanups") from the net-next tree and commitafb43e6d88e5("wlcore: removeif_opsfromplatform_data") from the wireless-next tree.I fixed it up (see below) and can carry the fix as necessary (no action is required).
The fix up looks good. Thanks!
Review
Quoted 9 lines
Thanks Stephen.
Can you remove just the
dev_errbelow too please.(quoted diff) +5
-0+ pdev_data = kzalloc(sizeof(*pdev_data), GFP_KERNEL); + if (!pdev_data) { + dev_err(&func->dev, "can't allocate platdev_data\n"); + goto out; + }Yes, and there's also another one in
drivers/net/wireless/ti/wlcore/spi.c:
Review
Quoted 5 lines
(quoted diff) +5
-0+ pdev_data = kzalloc(sizeof(*pdev_data), GFP_KERNEL); + if (!pdev_data) { + dev_err(&spi->dev, "can't allocate platdev_data\n"); + goto out; + }
I presume that there is no harm in actually fixing these extra ones directly in the wireless-next tree, right? (hint, John, hint :-))
Signature · 2 lines
Cheers, Stephen Rothwell [email protected]
Quoted 32 lines · Stephen Rothwell
Hi all,
Quoted 29 lines · On Mon, 11 Feb 2013 08:47:54 +0200 Luciano Coelho <[email protected]> wrote:
Quoted 11 lines · Joe Perches
Quoted 10 lines · Stephen Rothwell
Today's linux-next merge of the wireless-next tree got conflicts in
drivers/net/wireless/ti/wlcore/sdio.canddrivers/net/wireless/ti/wlcore/spi.cbetween commit0d2e7a5c6080("wireless: Remove unnecessary alloc/OOM messages, alloc cleanups") from the net-next tree and commitafb43e6d88e5("wlcore: removeif_opsfromplatform_data") from the wireless-next tree.I fixed it up (see below) and can carry the fix as necessary (no action is required).
The fix up looks good. Thanks!
Review
Quoted 9 lines
Thanks Stephen.
Can you remove just the
dev_errbelow too please.(quoted diff) +5
-0+ pdev_data = kzalloc(sizeof(*pdev_data), GFP_KERNEL); + if (!pdev_data) { + dev_err(&func->dev, "can't allocate platdev_data\n"); + goto out; + }Yes, and there's also another one in
drivers/net/wireless/ti/wlcore/spi.c:
Quoted 8 lines
Review
Quoted 5 lines
(quoted diff) +5
-0+ pdev_data = kzalloc(sizeof(*pdev_data), GFP_KERNEL); + if (!pdev_data) { + dev_err(&spi->dev, "can't allocate platdev_data\n"); + goto out; + }I presume that there is no harm in actually fixing these extra ones directly in the wireless-next tree, right? (hint, John, hint :-))
I'll send a patch fixing this in a minute.
--
Luca.
PATCH 1/1 wlcore: remove newly introduced alloc/OOM messages
In commit 0d2e7a5c (wireless: Remove unnecessary alloc/OOM messages, alloc cleanups) OOM messages after alloc were removed from the wlcore modules.
Commit afb43e6d (wlcore: remove if_ops from platform_data) reintroduced a couple of those. This patch removes them.
---
John,
Can you apply this directly on wireless-next after you process my latest pull-request?
Thanks!
drivers/net/wireless/ti/Kconfig | 9 ---- drivers/net/wireless/ti/Makefile | 4 +- drivers/net/wireless/ti/wl1251/ps.c | 3 +- drivers/net/wireless/ti/wl12xx/main.c | 3 +- drivers/net/wireless/ti/wl18xx/conf.h | 7 ++- drivers/net/wireless/ti/wl18xx/main.c | 5 -- drivers/net/wireless/ti/wlcore/Kconfig | 5 ++ drivers/net/wireless/ti/wlcore/Makefile | 3 ++ drivers/net/wireless/ti/wlcore/boot.c | 4 +- drivers/net/wireless/ti/wlcore/cmd.c | 8 ++-- drivers/net/wireless/ti/wlcore/main.c | 17 ++++--- drivers/net/wireless/ti/wlcore/sdio.c | 4 +- drivers/net/wireless/ti/wlcore/spi.c | 4 +- .../net/wireless/ti/wlcore/wl12xx_platform_data.c | 49 ++++++++++++++++++++ drivers/net/wireless/ti/wlcore/wlcore.h | 1 + drivers/net/wireless/ti/wlcore/wlcore_i.h | 9 +--- 16 files changed, 83 insertions(+), 52 deletions(-) create mode 100644 drivers/net/wireless/ti/wlcore/wl12xx_platform_data.c
drivers/net/wireless/ti/Kconfig +0 -9
@@ -12,13 +12,4 @@ source "drivers/net/wireless/ti/wl18xx/Kconfig" # keep last for automatic dependencies source "drivers/net/wireless/ti/wlcore/Kconfig" - -config WILINK_PLATFORM_DATA - bool "TI WiLink platform data" - depends on WLCORE_SDIO || WL1251_SDIO - default y - ---help--- - Small platform data bit needed to pass data to the sdio modules. - - endif # WL_TI
drivers/net/wireless/ti/Makefile +1 -3
@@ -1,7 +1,5 @@ obj-$(CONFIG_WLCORE) += wlcore/ obj-$(CONFIG_WL12XX) += wl12xx/ +obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wlcore/ obj-$(CONFIG_WL1251) += wl1251/ obj-$(CONFIG_WL18XX) += wl18xx/ - -# small builtin driver bit -obj-$(CONFIG_WILINK_PLATFORM_DATA) += wilink_platform_data.o
drivers/net/wireless/ti/wl1251/ps.c +1 -2
@@ -68,8 +68,7 @@ int wl1251_ps_elp_wakeup(struct wl1251 *wl)unsigned long timeout, start;u32 elp_reg; -if (delayed_work_pending (&wl->elp_work)) -cancel_delayed_work (&wl->elp_work); +cancel_delayed_work (&wl->elp_work);if (!wl->elp)return 0 ;
drivers/net/wireless/ti/wl12xx/main.c +1 -2
@@ -1703,8 +1703,7 @@ static struct ieee80211_sta_ht_cap wl12xx_ht_cap = {static int wl12xx_setup (struct wl1271 *wl) {struct wl12xx_priv *priv = wl->priv; -struct wlcore_platdev_data *pdev_data = wl->pdev->dev.platform_data; -struct wl12xx_platform_data *pdata = pdev_data->pdata; +struct wl12xx_platform_data *pdata = wl->pdev->dev.platform_data; wl->rtable = wl12xx_rtable; wl->num_tx_desc =WL12XX_NUM_TX_DESCRIPTORS ;
drivers/net/wireless/ti/wl18xx/conf.h +3 -4
@@ -23,7 +23,7 @@#define __WL18XX_CONF_H__#define WL18XX_CONF_MAGIC 0x10e100ca -#define WL18XX_CONF_VERSION (WLCORE_CONF_VERSION | 0x0006) +#define WL18XX_CONF_VERSION (WLCORE_CONF_VERSION | 0x0005)#define WL18XX_CONF_MASK 0x0000ffff#define WL18XX_CONF_SIZE (WLCORE_CONF_SIZE + \ sizeof(struct wl18xx_priv_conf))
@@ -70,9 +70,8 @@ struct wl18xx_mac_and_phy_params {u8 pwr_limit_reference_11_abg;u8 per_chan_pwr_limit_arr_11p[NUM_OF_CHANNELS_11_P ];u8 pwr_limit_reference_11p; -u8 spare1; -u8 per_chan_bo_mode_11_abg[13 ]; -u8 per_chan_bo_mode_11_p[4 ]; +u8 spare1[9 ]; +u8 spare2[9 ];u8 primary_clock_setting_time;u8 clock_valid_on_wake_up;u8 secondary_clock_setting_time;
drivers/net/wireless/ti/wl18xx/main.c +0 -5
@@ -547,11 +547,6 @@ static struct wl18xx_priv_conf wl18xx_default_priv_conf = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff , 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, .pwr_limit_reference_11p = 0x64, - .per_chan_bo_mode_11_abg = { 0x00, 0x00, 0x00, 0x00, -0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 , - 0x00 }, - .per_chan_bo_mode_11_p = { 0x00, 0x00, 0x00, 0x00 }, .per_chan_pwr_limit_arr_11p = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, .psat = 0,
drivers/net/wireless/ti/wlcore/Kconfig +5 -0
@@ -33,3 +33,8 @@ config WLCORE_SDIO If you choose to build a module, it'll be called wlcore_sdio. Say N if unsure. + +config WL12XX_PLATFORM_DATA + bool + depends on WLCORE_SDIO != n || WL1251_SDIO != n + default y
drivers/net/wireless/ti/wlcore/Makefile +3 -0
@@ -9,4 +9,7 @@ obj-$(CONFIG_WLCORE) += wlcore.o obj-$(CONFIG_WLCORE_SPI) += wlcore_spi.o obj-$(CONFIG_WLCORE_SDIO) += wlcore_sdio.o +# small builtin driver bit +obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx_platform_data.o + ccflags-y += -D__CHECK_ENDIAN__
drivers/net/wireless/ti/wlcore/boot.c +2 -2
@@ -84,8 +84,8 @@ out:static int wlcore_validate_fw_ver (struct wl1271 *wl) {unsigned int *fw_ver = wl->chip.fw_ver; -unsigned int *min_ver = (wl->fw_type ==WL12XX_FW_TYPE_MULTI ) ? - wl->min_mr_fw_ver : wl->min_sr_fw_ver; +unsigned int *min_ver = (wl->fw_type ==WL12XX_FW_TYPE_NORMAL ) ? + wl->min_sr_fw_ver : wl->min_mr_fw_ver;char min_fw_str[32 ] ="" ;int i;
drivers/net/wireless/ti/wlcore/cmd.c +3 -5
@@ -510,12 +510,10 @@ int wl12xx_cmd_role_start_sta(struct wl1271 *wl, struct wl12xx_vif *wlvif) cmd->sta.hlid = wlvif->sta.hlid; cmd->sta.session = wl->session_ids[wlvif->sta.hlid];/* -* We don't have the correct remote rates in this stage. The -* rates will be reconfigured later, after association, if the -* firmware supports ACX_PEER_CAP. Otherwise, there's nothing -* we can do, so use all supported_rates here. +* We don't have the correct remote rates in this stage. the rates +* will be reconfigured later, after authorization. */ - cmd->sta.remote_rates =cpu_to_le32 (supported_rates); + cmd->sta.remote_rates =cpu_to_le32 (wlvif->rate_set); wl1271_debug(DEBUG_CMD, "role start: roleid=%d, hlid=%d, session=%d " "basic_rate_set: 0x%x, remote_rates: 0x%x",
drivers/net/wireless/ti/wlcore/main.c +10 -7
@@ -2162,7 +2162,7 @@ static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif)return 0 ; } -static int wl12xx_init_fw (struct wl1271 *wl) +static bool wl12xx_init_fw (struct wl1271 *wl) {int retries =WL1271_BOOT_RETRIES ;bool booted = false;
@@ -2228,7 +2228,7 @@ power_off: wl->state =WLCORE_STATE_ON ; out: -return ret; +return booted; }static bool wl12xx_dev_role_started (struct wl12xx_vif *wlvif)
@@ -2371,6 +2371,7 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,struct vif_counter_data vif_count;int ret =0 ;u8 role_type; +bool booted = false; vif->driver_flags |=IEEE80211_VIF_BEACON_FILTER |IEEE80211_VIF_SUPPORTS_CQM_RSSI ;
@@ -2431,9 +2432,11 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,*/ memcpy (wl->addresses[0 ].addr, vif->addr,ETH_ALEN ); - ret =wl12xx_init_fw (wl); -if (ret <0 ) + booted =wl12xx_init_fw (wl); +if (!booted) { + ret = -EINVAL ; goto out; + } } ret = wl12xx_cmd_role_enable(wl, vif->addr,
@@ -5963,8 +5966,7 @@ static void wlcore_nvs_cb(const struct firmware *fw, void *context) {struct wl1271 *wl = context;struct platform_device *pdev = wl->pdev; -struct wlcore_platdev_data *pdev_data = pdev->dev.platform_data; -struct wl12xx_platform_data *pdata = pdev_data->pdata; +struct wl12xx_platform_data *pdata = pdev->dev.platform_data;unsigned long irqflags;int ret;
@@ -5993,7 +5995,8 @@ static void wlcore_nvs_cb(const struct firmware *fw, void *context) wl->irq =platform_get_irq (pdev,0 ); wl->platform_quirks = pdata->platform_quirks; - wl->if_ops = pdev_data->if_ops; + wl->set_power = pdata->set_power; + wl->if_ops = pdata->ops;if (wl->platform_quirks &WL12XX_PLATFORM_QUIRK_EDGE_IRQ ) irqflags =IRQF_TRIGGER_RISING ;
drivers/net/wireless/ti/wlcore/sdio.c +1 -3
@@ -229,10 +229,8 @@ static int wl1271_probe(struct sdio_func *func,return -ENODEV ; pdev_data =kzalloc (sizeof (*pdev_data),GFP_KERNEL ); -if (!pdev_data) { -dev_err (&func->dev,"can't allocate platdev_data\n" ); +if (!pdev_data) goto out; - } pdev_data->if_ops = &sdio_ops;
drivers/net/wireless/ti/wlcore/spi.c +1 -3
@@ -332,10 +332,8 @@ static int wl1271_probe(struct spi_device *spi)int ret = -ENOMEM ; pdev_data =kzalloc (sizeof (*pdev_data),GFP_KERNEL ); -if (!pdev_data) { -dev_err (&spi->dev,"can't allocate platdev_data\n" ); +if (!pdev_data) goto out; - } pdev_data->pdata = spi->dev.platform_data;if (!pdev_data->pdata) {
drivers/net/wireless/ti/wlcore/wl12xx_platform_data.c new file +49 -0
49 lines not on this page · raw message
drivers/net/wireless/ti/wlcore/wlcore.h +1 -0
@@ -183,6 +183,7 @@ struct wl1271 {struct wl1271_if_operations *if_ops; +void (*set_power)(bool enable);int irq;spinlock_t wl_lock;
drivers/net/wireless/ti/wlcore/wlcore_i.h +2 -7
@@ -111,9 +111,9 @@ enum {struct wl1271_chip {u32 id; -char fw_ver_str[ETHTOOL_BUSINFO_LEN ]; +char fw_ver_str[ETHTOOL_FWVERS_LEN ];unsigned int fw_ver[NUM_FW_VER ]; -char phy_fw_ver_str[ETHTOOL_BUSINFO_LEN ]; +char phy_fw_ver_str[ETHTOOL_FWVERS_LEN ]; };#define NUM_TX_QUEUES 4
@@ -206,11 +206,6 @@ struct wl1271_if_operations {void (*set_block_size) (struct device *child,unsigned int blksz); }; -struct wlcore_platdev_data { -struct wl12xx_platform_data *pdata; -struct wl1271_if_operations *if_ops; -}; -#define MAX_NUM_KEYS 14#define MAX_KEY_SIZE 32
Signature · 1 line
1.7.10.4
Re: [PATCH] wlcore: remove newly introduced alloc/OOM messages
Quoted 7 lines · Luciano Coelho
In commit
0d2e7a5c(wireless: Remove unnecessary alloc/OOM messages, alloc cleanups) OOM messages after alloc were removed from the wlcore modules.Commit
afb43e6d(wlcore: removeif_opsfromplatform_data) reintroduced a couple of those. This patch removes them.
Quoted 8 lines
Signed-off-by Luciano Coelho <[email protected]>---
John,
Can you apply this directly on wireless-next after you process my latest pull-request?
Thanks!
Ermm... obviously this is completely wrong. I'll send v2 in a bit.
--
Luca.
Re: [PATCH] wlcore: remove newly introduced alloc/OOM messages
In reply to Luciano CoelhoQuoted 6 lines · Luciano Coelho
In commit
0d2e7a5c(wireless: Remove unnecessary alloc/OOM messages, alloc cleanups) OOM messages after alloc were removed from the wlcore modules.Commit
afb43e6d(wlcore: removeif_opsfromplatform_data) reintroduced a couple of those. This patch removes them.
You sure?
The largish patch doesn't match the commit message.
Re: [PATCH] wlcore: remove newly introduced alloc/OOM messages
Quoted 11 lines · Joe Perches
Quoted 6 lines · Luciano Coelho
In commit
0d2e7a5c(wireless: Remove unnecessary alloc/OOM messages, alloc cleanups) OOM messages after alloc were removed from the wlcore modules.Commit
afb43e6d(wlcore: removeif_opsfromplatform_data) reintroduced a couple of those. This patch removes them.You sure?
The largish patch doesn't match the commit message.
Sorry, I screwed up. I'll send v2 in a second (should get some more coffee first ;)
--
Luca.
Re: [PATCH] wlcore: remove newly introduced alloc/OOM messages
In reply to Luciano CoelhoQuoted 7 lines · Luciano Coelho
In commit
0d2e7a5c(wireless: Remove unnecessary alloc/OOM messages, alloc cleanups) OOM messages after alloc were removed from the wlcore modules.Commit
afb43e6d(wlcore: removeif_opsfromplatform_data) reintroduced a couple of those. This patch removes them.
Quoted 6 lines
Signed-off-by Luciano Coelho <[email protected]>---
John,
Can you apply this directly on wireless-next after you process my latest pull-request?
please don't... patch isn't really what commit log says :-)
Signature · 1 line
balbi
PATCH v2 1/1 wlcore: remove newly introduced alloc/OOM messages
In reply to Luciano CoelhoIn commit 0d2e7a5c (wireless: Remove unnecessary alloc/OOM messages, alloc cleanups) OOM messages after alloc were removed from the wlcore modules.
Commit afb43e6d (wlcore: remove if_ops from platform_data) reintroduced a couple of those. This patch removes them.
---
John,
Please ignore my previous patch. Now this should be right. ;)
Can you apply this directly on wireless-next after you process my latest pull-request?
Thanks!
Sorry for my monday-morning-with-too-little-caffeinne-in-the-blood screw up. ;)
drivers/net/wireless/ti/wlcore/sdio.c | 4 +--- drivers/net/wireless/ti/wlcore/spi.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)
drivers/net/wireless/ti/wlcore/sdio.c +1 -3
@@ -229,10 +229,8 @@ static int wl1271_probe(struct sdio_func *func,return -ENODEV ; pdev_data =kzalloc (sizeof (*pdev_data),GFP_KERNEL ); -if (!pdev_data) { -dev_err (&func->dev,"can't allocate platdev_data\n" ); +if (!pdev_data) goto out; - } pdev_data->if_ops = &sdio_ops;
drivers/net/wireless/ti/wlcore/spi.c +1 -3
@@ -332,10 +332,8 @@ static int wl1271_probe(struct spi_device *spi)int ret = -ENOMEM ; pdev_data =kzalloc (sizeof (*pdev_data),GFP_KERNEL ); -if (!pdev_data) { -dev_err (&spi->dev,"can't allocate platdev_data\n" ); +if (!pdev_data) goto out; - } pdev_data->pdata = spi->dev.platform_data;if (!pdev_data->pdata) {
Signature · 1 line
1.7.10.4
Re: [PATCH v2] wlcore: remove newly introduced alloc/OOM messages
Quoted 8 lines · Luciano Coelho
In commit
0d2e7a5c(wireless: Remove unnecessary alloc/OOM messages, alloc cleanups) OOM messages after alloc were removed from the wlcore modules.Commit
afb43e6d(wlcore: removeif_opsfromplatform_data) reintroduced a couple of those. This patch removes them.Signed-off-by Luciano Coelho <[email protected]>
looks good now :-)
Signature · 1 line
balbi