Commit ecce1f09 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka
Browse files

iwlegacy: merge iwl-3945-led.c into 3945.c 



Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
parent fc19cbde

drivers/net/wireless/iwlegacy/3945.c

+19 −1
Original line number Diff line number Diff line
@@ -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,   \

drivers/net/wireless/iwlegacy/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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__

drivers/net/wireless/iwlegacy/iwl-3945-led.c

deleted100644 → 0
+0 −63
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of version 2 of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA

 *

 * The full GNU General Public License is included in this distribution in the

 * file called LICENSE.

 *

 * Contact Information:

 *  Intel Linux Wireless <ilw@linux.intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 *****************************************************************************/



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/delay.h>

#include <linux/skbuff.h>

#include <linux/netdevice.h>

#include <net/mac80211.h>

#include <linux/etherdevice.h>

#include <asm/unaligned.h>



#include "iwl-commands.h"

#include "iwl-3945.h"

#include "iwl-core.h"

#include "iwl-dev.h"

#include "iwl-3945-led.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,

};

drivers/net/wireless/iwlegacy/iwl-3945-led.h

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of version 2 of the GNU General Public License as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA

 *

 * The full GNU General Public License is included in this distribution in the

 * file called LICENSE.

 *

 * Contact Information:

 *  Intel Linux Wireless <ilw@linux.intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 *****************************************************************************/



#ifndef __il_3945_led_h__

#define __il_3945_led_h__



extern const struct il_led_ops il3945_led_ops;



#endif /* __il_3945_led_h__ */