Skip to content

Commit

Permalink
iwlegacy: merge iwl-3945-led.c into 3945.c
Browse files Browse the repository at this point in the history
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
  • Loading branch information
Stanislaw Gruszka committed Nov 15, 2011
1 parent fc19cbd commit ecce1f0
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 97 deletions.
20 changes: 19 additions & 1 deletion drivers/net/wireless/iwlegacy/3945.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,27 @@
#include "iwl-core.h"
#include "iwl-helpers.h"
#include "iwl-led.h"
#include "iwl-3945-led.h"
#include "iwl-3945-debugfs.h"

/* Send led command */
static int il3945_send_led_cmd(struct il_priv *il,
struct il_led_cmd *led_cmd)
{
struct il_host_cmd cmd = {
.id = REPLY_LEDS_CMD,
.len = sizeof(struct il_led_cmd),
.data = led_cmd,
.flags = CMD_ASYNC,
.callback = NULL,
};

return il_send_cmd(il, &cmd);
}

const struct il_led_ops il3945_led_ops = {
.cmd = il3945_send_led_cmd,
};

#define IL_DECLARE_RATE_INFO(r, ip, in, rp, rn, pp, np) \
[RATE_##r##M_IDX] = { RATE_##r##M_PLCP, \
RATE_##r##M_IEEE, \
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/iwlegacy/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ iwl4965-$(CONFIG_IWLEGACY_DEBUGFS) += iwl-4965-debugfs.o

# 3945
obj-$(CONFIG_IWL3945) += iwl3945.o
iwl3945-objs := 3945-mac.o 3945.o iwl-3945-rs.o iwl-3945-led.o
iwl3945-objs := 3945-mac.o 3945.o iwl-3945-rs.o
iwl3945-$(CONFIG_IWLEGACY_DEBUGFS) += iwl-3945-debugfs.o

ccflags-y += -D__CHECK_ENDIAN__
63 changes: 0 additions & 63 deletions drivers/net/wireless/iwlegacy/iwl-3945-led.c

This file was deleted.

32 changes: 0 additions & 32 deletions drivers/net/wireless/iwlegacy/iwl-3945-led.h

This file was deleted.

0 comments on commit ecce1f0

Please sign in to comment.