Commit 7dd73bbc authored by Denys Vlasenko's avatar Denys Vlasenko Committed by Jeff Garzik
Browse files

sb1000.c: make const arrays static 



This patch replaces automatic constant arrays a-la

    const unsigned char Command0[6] = {0x80, 0x16, 0x00, 0x00, 0x00, 0x00};

with static ones. Size difference for 32bit x86:

text  data   bss     dec     hex filename
5418   129     0    5547    15ab linux-2.6.inline-ALLYES/drivers/net/sb1000.o
5396   129     0    5525    1595 linux-2.6.followup-ALLYES/drivers/net/sb1000.o

Signed-off-by: default avatarDenys Vlasenko <vda.linux@googlemail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent a8d06342

drivers/net/sb1000.c

+29 −18
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ sb1000_read_status(const int ioaddr[], unsigned char in[]) 
static void

sb1000_issue_read_command(const int ioaddr[], const char* name)

{

	const unsigned char Command0[6] = {0x20, 0x00, 0x00, 0x01, 0x00, 0x00};

	static const unsigned char Command0[6] = {0x20, 0x00, 0x00, 0x01, 0x00, 0x00};



	sb1000_wait_for_ready_clear(ioaddr, name);

	outb(0xa0, ioaddr[0] + 6);
@@ -453,9 +453,10 @@ sb1000_issue_read_command(const int ioaddr[], const char* name) 
static int

sb1000_reset(const int ioaddr[], const char* name)

{

	static const unsigned char Command0[6] = {0x80, 0x16, 0x00, 0x00, 0x00, 0x00};



	unsigned char st[7];

	int port, status;

	const unsigned char Command0[6] = {0x80, 0x16, 0x00, 0x00, 0x00, 0x00};



	port = ioaddr[1] + 6;

	outb(0x4, port);
@@ -482,9 +483,10 @@ sb1000_reset(const int ioaddr[], const char* name) 
static int

sb1000_check_CRC(const int ioaddr[], const char* name)

{

	static const unsigned char Command0[6] = {0x80, 0x1f, 0x00, 0x00, 0x00, 0x00};



	unsigned char st[7];

	int crc, status;

	const unsigned char Command0[6] = {0x80, 0x1f, 0x00, 0x00, 0x00, 0x00};



	/* check CRC */

	if ((status = card_send_command(ioaddr, name, Command0, st)))
@@ -498,8 +500,9 @@ sb1000_check_CRC(const int ioaddr[], const char* name) 
static inline int

sb1000_start_get_set_command(const int ioaddr[], const char* name)

{

	static const unsigned char Command0[6] = {0x80, 0x1b, 0x00, 0x00, 0x00, 0x00};



	unsigned char st[7];

	const unsigned char Command0[6] = {0x80, 0x1b, 0x00, 0x00, 0x00, 0x00};



	return card_send_command(ioaddr, name, Command0, st);

}
@@ -507,10 +510,11 @@ sb1000_start_get_set_command(const int ioaddr[], const char* name) 
static int

sb1000_end_get_set_command(const int ioaddr[], const char* name)

{

	static const unsigned char Command0[6] = {0x80, 0x1b, 0x02, 0x00, 0x00, 0x00};

	static const unsigned char Command1[6] = {0x20, 0x00, 0x00, 0x00, 0x00, 0x00};



	unsigned char st[7];

	int status;

	const unsigned char Command0[6] = {0x80, 0x1b, 0x02, 0x00, 0x00, 0x00};

	const unsigned char Command1[6] = {0x20, 0x00, 0x00, 0x00, 0x00, 0x00};



	if ((status = card_send_command(ioaddr, name, Command0, st)))

		return status;
@@ -520,10 +524,11 @@ sb1000_end_get_set_command(const int ioaddr[], const char* name) 
static int

sb1000_activate(const int ioaddr[], const char* name)

{

	static const unsigned char Command0[6] = {0x80, 0x11, 0x00, 0x00, 0x00, 0x00};

	static const unsigned char Command1[6] = {0x80, 0x16, 0x00, 0x00, 0x00, 0x00};



	unsigned char st[7];

	int status;

	const unsigned char Command0[6] = {0x80, 0x11, 0x00, 0x00, 0x00, 0x00};

	const unsigned char Command1[6] = {0x80, 0x16, 0x00, 0x00, 0x00, 0x00};



	ssleep(1);

	if ((status = card_send_command(ioaddr, name, Command0, st)))
@@ -544,9 +549,10 @@ static int 
sb1000_get_firmware_version(const int ioaddr[], const char* name,

	unsigned char version[], int do_end)

{

	static const unsigned char Command0[6] = {0x80, 0x23, 0x00, 0x00, 0x00, 0x00};



	unsigned char st[7];

	int status;

	const unsigned char Command0[6] = {0x80, 0x23, 0x00, 0x00, 0x00, 0x00};



	if ((status = sb1000_start_get_set_command(ioaddr, name)))

		return status;
@@ -566,9 +572,10 @@ sb1000_get_firmware_version(const int ioaddr[], const char* name, 
static int

sb1000_get_frequency(const int ioaddr[], const char* name, int* frequency)

{

	static const unsigned char Command0[6] = {0x80, 0x44, 0x00, 0x00, 0x00, 0x00};



	unsigned char st[7];

	int status;

	const unsigned char Command0[6] = {0x80, 0x44, 0x00, 0x00, 0x00, 0x00};



	udelay(1000);

	if ((status = sb1000_start_get_set_command(ioaddr, name)))
@@ -613,12 +620,13 @@ sb1000_set_frequency(const int ioaddr[], const char* name, int frequency) 
static int

sb1000_get_PIDs(const int ioaddr[], const char* name, short PID[])

{

	static const unsigned char Command0[6] = {0x80, 0x40, 0x00, 0x00, 0x00, 0x00};

	static const unsigned char Command1[6] = {0x80, 0x41, 0x00, 0x00, 0x00, 0x00};

	static const unsigned char Command2[6] = {0x80, 0x42, 0x00, 0x00, 0x00, 0x00};

	static const unsigned char Command3[6] = {0x80, 0x43, 0x00, 0x00, 0x00, 0x00};



	unsigned char st[7];

	int status;

	const unsigned char Command0[6] = {0x80, 0x40, 0x00, 0x00, 0x00, 0x00};

	const unsigned char Command1[6] = {0x80, 0x41, 0x00, 0x00, 0x00, 0x00};

	const unsigned char Command2[6] = {0x80, 0x42, 0x00, 0x00, 0x00, 0x00};

	const unsigned char Command3[6] = {0x80, 0x43, 0x00, 0x00, 0x00, 0x00};



	udelay(1000);

	if ((status = sb1000_start_get_set_command(ioaddr, name)))
@@ -647,6 +655,8 @@ sb1000_get_PIDs(const int ioaddr[], const char* name, short PID[]) 
static int

sb1000_set_PIDs(const int ioaddr[], const char* name, const short PID[])

{

	static const unsigned char Command4[6] = {0x80, 0x2e, 0x00, 0x00, 0x00, 0x00};



	unsigned char st[7];

	short p;

	int status;
@@ -654,7 +664,6 @@ sb1000_set_PIDs(const int ioaddr[], const char* name, const short PID[]) 
	unsigned char Command1[6] = {0x80, 0x32, 0x00, 0x00, 0x00, 0x00};

	unsigned char Command2[6] = {0x80, 0x33, 0x00, 0x00, 0x00, 0x00};

	unsigned char Command3[6] = {0x80, 0x34, 0x00, 0x00, 0x00, 0x00};

	const unsigned char Command4[6] = {0x80, 0x2e, 0x00, 0x00, 0x00, 0x00};



	udelay(1000);

	if ((status = sb1000_start_get_set_command(ioaddr, name)))
@@ -891,11 +900,12 @@ dropped_frame: 
static void

sb1000_error_dpc(struct net_device *dev)

{

	static const unsigned char Command0[6] = {0x80, 0x26, 0x00, 0x00, 0x00, 0x00};



	char *name;

	unsigned char st[5];

	int ioaddr[2];

	struct sb1000_private *lp = netdev_priv(dev);

	const unsigned char Command0[6] = {0x80, 0x26, 0x00, 0x00, 0x00, 0x00};

	const int ErrorDpcCounterInitialize = 200;



	ioaddr[0] = dev->base_addr;
@@ -1077,14 +1087,15 @@ sb1000_start_xmit(struct sk_buff *skb, struct net_device *dev) 
/* SB1000 interrupt handler. */

static irqreturn_t sb1000_interrupt(int irq, void *dev_id)

{

	static const unsigned char Command0[6] = {0x80, 0x2c, 0x00, 0x00, 0x00, 0x00};

	static const unsigned char Command1[6] = {0x80, 0x2e, 0x00, 0x00, 0x00, 0x00};



	char *name;

	unsigned char st;

	int ioaddr[2];

	struct net_device *dev = dev_id;

	struct sb1000_private *lp = netdev_priv(dev);



	const unsigned char Command0[6] = {0x80, 0x2c, 0x00, 0x00, 0x00, 0x00};

	const unsigned char Command1[6] = {0x80, 0x2e, 0x00, 0x00, 0x00, 0x00};

	const int MaxRxErrorCount = 6;



	ioaddr[0] = dev->base_addr;

CRA Git | Maintained and supported by SUSTech CRA and CCSE