2010-03-11 15:44:55

by Grazvydas Ignotas

Subject: [PATCH 1/4] wl1251: make local symbols static

Make local functions and data static, also constify
some structures. While at it, clean up unneeded includes.

Signed-off-by: Grazvydas Ignotas <[email protected]>
Cc: Bob Copeland <[email protected]>
---
drivers/net/wireless/wl12xx/wl1251_sdio.c | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/drivers/net/wireless/wl12xx/wl1251_sdio.c b/drivers/net/wireless/wl12xx/wl1251_sdio.c
index 9423f22..0aceb91 100644
--- a/drivers/net/wireless/wl12xx/wl1251_sdio.c
+++ b/drivers/net/wireless/wl12xx/wl1251_sdio.c
@@ -20,20 +20,10 @@
* Copyright (C) 2009 Bob Copeland ([email protected])
*/
#include <linux/module.h>
-#include <linux/crc7.h>
-#include <linux/mod_devicetable.h>
-#include <linux/irq.h>
#include <linux/mmc/sdio_func.h>
#include <linux/mmc/sdio_ids.h>
-#include <linux/platform_device.h>

#include "wl1251.h"
-#include "wl12xx_80211.h"
-#include "wl1251_reg.h"
-#include "wl1251_ps.h"
-#include "wl1251_io.h"
-#include "wl1251_tx.h"
-#include "wl1251_debugfs.h"

#ifndef SDIO_VENDOR_ID_TI
#define SDIO_VENDOR_ID_TI 0x104c
@@ -65,7 +55,8 @@ static const struct sdio_device_id wl1251_devices[] = {
MODULE_DEVICE_TABLE(sdio, wl1251_devices);


-void wl1251_sdio_read(struct wl1251 *wl, int addr, void *buf, size_t len)
+static void wl1251_sdio_read(struct wl1251 *wl, int addr,
+ void *buf, size_t len)
{
int ret;
struct sdio_func *func = wl_to_func(wl);
@@ -77,7 +68,8 @@ void wl1251_sdio_read(struct wl1251 *wl, int addr, void *buf, size_t len)
sdio_release_host(func);
}

-void wl1251_sdio_write(struct wl1251 *wl, int addr, void *buf, size_t len)
+static void wl1251_sdio_write(struct wl1251 *wl, int addr,
+ void *buf, size_t len)
{
int ret;
struct sdio_func *func = wl_to_func(wl);
@@ -89,7 +81,7 @@ void wl1251_sdio_write(struct wl1251 *wl, int addr, void *buf, size_t len)
sdio_release_host(func);
}

-void wl1251_sdio_reset(struct wl1251 *wl)
+static void wl1251_sdio_reset(struct wl1251 *wl)
{
}

@@ -111,11 +103,11 @@ static void wl1251_sdio_disable_irq(struct wl1251 *wl)
sdio_release_host(func);
}

-void wl1251_sdio_set_power(bool enable)
+static void wl1251_sdio_set_power(bool enable)
{
}

-struct wl1251_if_operations wl1251_sdio_ops = {
+static const struct wl1251_if_operations wl1251_sdio_ops = {
.read = wl1251_sdio_read,
.write = wl1251_sdio_write,
.reset = wl1251_sdio_reset,
@@ -123,7 +115,8 @@ struct wl1251_if_operations wl1251_sdio_ops = {
.disable_irq = wl1251_sdio_disable_irq,
};

-int wl1251_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id)
+static int wl1251_sdio_probe(struct sdio_func *func,
+ const struct sdio_device_id *id)
{
int ret;
struct wl1251 *wl;
--
1.6.3.3

2010-03-12 10:02:39

by Grazvydas Ignotas

Subject: Re: [PATCH 1/4] wl1251: make local symbols static

On Fri, Mar 12, 2010 at 8:32 AM, Kalle Valo <[email protected]> wrote:
> Grazvydas Ignotas <[email protected]> writes:
>
>> Make local functions and data static, also constify
>> some structures. While at it, clean up unneeded includes.
>>
>> Signed-off-by: Grazvydas Ignotas <[email protected]>
>> Cc: Bob Copeland <[email protected]>
>
> Thanks. Looks good, but...
>
>> -#include <linux/mod_devicetable.h>
>
> ...this is needed for struct sdio_device_id AFAICS. If you can send a
> new version which keeps that include, you'll have my acked-by.

That one comes through linux/mmc/sdio_func.h , but I'll add it back
for completeness and resend, thanks.

2010-03-12 06:32:44

by Kalle Valo

Subject: Re: [PATCH 1/4] wl1251: make local symbols static

Grazvydas Ignotas <[email protected]> writes:

> Make local functions and data static, also constify
> some structures. While at it, clean up unneeded includes.
>
> Signed-off-by: Grazvydas Ignotas <[email protected]>
> Cc: Bob Copeland <[email protected]>

Thanks. Looks good, but...

> -#include <linux/mod_devicetable.h>

...this is needed for struct sdio_device_id AFAICS. If you can send a
new version which keeps that include, you'll have my acked-by.

--
Kalle Valo