aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasakazu Mokuno <mokuno@sm.sony.co.jp>2008-05-30 03:27:42 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-06-03 15:00:27 -0400
commit3df4e2486a58826f16574ead1818daab0edb59df (patch)
treead68c458d9b11c5c64481d04ea49bfa9a56eb5d0
parent13de15e71db7a38f02c4d9f642f06541f5acc2b0 (diff)
PS3: gelic: Kill the static bounce buffer
As the bounce buffer is allocaetd dynamically, kill the static bounce buffer. Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/ps3_gelic_wireless.c9
-rw-r--r--drivers/net/ps3_gelic_wireless.h3
2 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index c16a30b28bf6..4bc6eaae23ca 100644
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -2472,16 +2472,9 @@ static struct net_device *gelic_wl_alloc(struct gelic_card *card)
2472 BUILD_BUG_ON(PAGE_SIZE < 2472 BUILD_BUG_ON(PAGE_SIZE <
2473 sizeof(struct gelic_eurus_scan_info) * 2473 sizeof(struct gelic_eurus_scan_info) *
2474 GELIC_EURUS_MAX_SCAN); 2474 GELIC_EURUS_MAX_SCAN);
2475 wl->buf = (void *)get_zeroed_page(GFP_KERNEL);
2476 if (!wl->buf) {
2477 pr_info("%s:buffer allocation failed\n", __func__);
2478 goto fail_getpage;
2479 }
2480 pr_debug("%s:end\n", __func__); 2475 pr_debug("%s:end\n", __func__);
2481 return netdev; 2476 return netdev;
2482 2477
2483fail_getpage:
2484 destroy_workqueue(wl->event_queue);
2485fail_event_workqueue: 2478fail_event_workqueue:
2486 destroy_workqueue(wl->eurus_cmd_queue); 2479 destroy_workqueue(wl->eurus_cmd_queue);
2487fail_cmd_workqueue: 2480fail_cmd_workqueue:
@@ -2500,8 +2493,6 @@ static void gelic_wl_free(struct gelic_wl_info *wl)
2500 2493
2501 pr_debug("%s: <-\n", __func__); 2494 pr_debug("%s: <-\n", __func__);
2502 2495
2503 free_page((unsigned long)wl->buf);
2504
2505 pr_debug("%s: destroy queues\n", __func__); 2496 pr_debug("%s: destroy queues\n", __func__);
2506 destroy_workqueue(wl->eurus_cmd_queue); 2497 destroy_workqueue(wl->eurus_cmd_queue);
2507 destroy_workqueue(wl->event_queue); 2498 destroy_workqueue(wl->event_queue);
diff --git a/drivers/net/ps3_gelic_wireless.h b/drivers/net/ps3_gelic_wireless.h
index bc730632da5b..5339e0078d18 100644
--- a/drivers/net/ps3_gelic_wireless.h
+++ b/drivers/net/ps3_gelic_wireless.h
@@ -288,9 +288,6 @@ struct gelic_wl_info {
288 u8 active_bssid[ETH_ALEN]; /* associated bssid */ 288 u8 active_bssid[ETH_ALEN]; /* associated bssid */
289 unsigned int essid_len; 289 unsigned int essid_len;
290 290
291 /* buffer for hypervisor IO */
292 void *buf;
293
294 struct iw_public_data wireless_data; 291 struct iw_public_data wireless_data;
295 struct iw_statistics iwstat; 292 struct iw_statistics iwstat;
296}; 293};