[PATCH] ipw2100: Use ARRAY_SIZE macro when appropriate (22d57432) · Commits · 戴 / test

drivers/net/wireless/ipw2100.c

+6 −8

Original line number	Diff line number	Diff line
		@@ -2888,7 +2888,7 @@ static int __ipw2100_tx_process(struct ipw2100_priv *priv)

		#ifdef CONFIG_IPW2100_DEBUG
		if (packet->info.c_struct.cmd->host_command_reg <
		sizeof(command_types) / sizeof(*command_types))
		ARRAY_SIZE(command_types))
		IPW_DEBUG_TX("Command '%s (%d)' processed: %d.\n",
		command_types[packet->info.c_struct.cmd->
		host_command_reg],
		@@ -3736,7 +3736,7 @@ static ssize_t show_registers(struct device d, struct device_attribute attr,

		out += sprintf(out, "%30s [Address ] : Hex\n", "Register");

		for (i = 0; i < (sizeof(hw_data) / sizeof(*hw_data)); i++) {
		for (i = 0; i < ARRAY_SIZE(hw_data); i++) {
		read_register(dev, hw_data[i].addr, &val);
		out += sprintf(out, "%30s [%08X] : %08X\n",
		hw_data[i].name, hw_data[i].addr, val);
		@@ -3757,7 +3757,7 @@ static ssize_t show_hardware(struct device d, struct device_attribute attr,

		out += sprintf(out, "%30s [Address ] : Hex\n", "NIC entry");

		for (i = 0; i < (sizeof(nic_data) / sizeof(*nic_data)); i++) {
		for (i = 0; i < ARRAY_SIZE(nic_data); i++) {
		u8 tmp8;
		u16 tmp16;
		u32 tmp32;
		@@ -3894,13 +3894,11 @@ static ssize_t show_ordinals(struct device d, struct device_attribute attr,
		if (priv->status & STATUS_RF_KILL_MASK)
		return 0;

		if (loop >= sizeof(ord_data) / sizeof(*ord_data))
		if (loop >= ARRAY_SIZE(ord_data))
		loop = 0;

		/* sysfs provides us PAGE_SIZE buffer */
		while (len < PAGE_SIZE - 128 &&
		loop < (sizeof(ord_data) / sizeof(*ord_data))) {

		while (len < PAGE_SIZE - 128 && loop < ARRAY_SIZE(ord_data)) {
		val_len = sizeof(u32);

		if (ipw2100_get_ordinal(priv, ord_data[loop].index, &val,
		@@ -6589,7 +6587,7 @@ static const long ipw2100_rates_11b[] = {
		11000000
		};

		#define RATE_COUNT (sizeof(ipw2100_rates_11b) / sizeof(ipw2100_rates_11b[0]))
		#define RATE_COUNT ARRAY_SIZE(ipw2100_rates_11b)

		static int ipw2100_wx_get_name(struct net_device *dev,
		struct iw_request_info *info,

Admin message