staging: vt6656: dead code remove zonetypes (9ef2184d) · Commits · 戴 / test

drivers/staging/vt6656/baseband.c

+1 −38

Original line number	Diff line number	Diff line
		@@ -899,43 +899,6 @@ int BBbVT3184Init(struct vnt_private *priv)
		if (status != STATUS_SUCCESS)
		return false;

		/* zonetype initial */
		priv->byOriginalZonetype = priv->abyEEPROM[EEP_OFS_ZONETYPE];

		if (priv->config_file.ZoneType >= 0) {
		if ((priv->config_file.ZoneType == 0) &&
		(priv->abyEEPROM[EEP_OFS_ZONETYPE] != 0x00)) {
		priv->abyEEPROM[EEP_OFS_ZONETYPE] = 0;
		priv->abyEEPROM[EEP_OFS_MAXCHANNEL] = 0x0B;

		dev_dbg(&priv->usb->dev, "Init Zone Type :USA\n");
		} else if ((priv->config_file.ZoneType == 1) &&
		(priv->abyEEPROM[EEP_OFS_ZONETYPE] != 0x01)) {
		priv->abyEEPROM[EEP_OFS_ZONETYPE] = 0x01;
		priv->abyEEPROM[EEP_OFS_MAXCHANNEL] = 0x0D;

		dev_dbg(&priv->usb->dev, "Init Zone Type :Japan\n");
		} else if ((priv->config_file.ZoneType == 2) &&
		(priv->abyEEPROM[EEP_OFS_ZONETYPE] != 0x02)) {
		priv->abyEEPROM[EEP_OFS_ZONETYPE] = 0x02;
		priv->abyEEPROM[EEP_OFS_MAXCHANNEL] = 0x0D;

		dev_dbg(&priv->usb->dev, "Init Zone Type :Europe\n");
		} else {
		if (priv->config_file.ZoneType !=
		priv->abyEEPROM[EEP_OFS_ZONETYPE])
		printk("zonetype in file[%02x]\
		mismatch with in EEPROM[%02x]\n",
		priv->config_file.ZoneType,
		priv->abyEEPROM[EEP_OFS_ZONETYPE]);
		else
		printk("Read Zonetype file success,\
		use default zonetype setting[%02x]\n",
		priv->config_file.ZoneType);
		}
		}

		if (!priv->bZoneRegExist)
		priv->byZoneType = priv->abyEEPROM[EEP_OFS_ZONETYPE];

		priv->byRFType = priv->abyEEPROM[EEP_OFS_RFTYPE];

drivers/staging/vt6656/card.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,6 @@
		#include "power.h"
		#include "key.h"
		#include "rc4.h"
		#include "country.h"
		#include "datarate.h"
		#include "usbpipe.h"

drivers/staging/vt6656/channel.c

+0 −298

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/vt6656/country.h

deleted100644 → 0

+0 −162

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 1996, 2003 VIA Networking Technologies, Inc.
		* All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License as published by
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*
		* 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-1301 USA.
		*
		*
		* File: country.h
		*
		* Purpose: Country Code information
		*
		* Author: Lucas Lin
		*
		* Date: Dec 23, 2004
		*
		*/

		#ifndef __COUNTRY_H__
		#define __COUNTRY_H__

		/************************************************************************
		* The definition here should be complied with the INF country order
		* Please check with VNWL.inf/VNWL64.inf/VNWL*.inf
		************************************************************************/
		typedef enum _COUNTRY_CODE {
		CCODE_FCC = 0,
		CCODE_TELEC,
		CCODE_ETSI,
		CCODE_RESV3,
		CCODE_RESV4,
		CCODE_RESV5,
		CCODE_RESV6,
		CCODE_RESV7,
		CCODE_RESV8,
		CCODE_RESV9,
		CCODE_RESVa,
		CCODE_RESVb,
		CCODE_RESVc,
		CCODE_RESVd,
		CCODE_RESVe,
		CCODE_ALLBAND,
		CCODE_ALBANIA,
		CCODE_ALGERIA,
		CCODE_ARGENTINA,
		CCODE_ARMENIA,
		CCODE_AUSTRALIA,
		CCODE_AUSTRIA,
		CCODE_AZERBAIJAN,
		CCODE_BAHRAIN,
		CCODE_BELARUS,
		CCODE_BELGIUM,
		CCODE_BELIZE,
		CCODE_BOLIVIA,
		CCODE_BRAZIL,
		CCODE_BRUNEI_DARUSSALAM,
		CCODE_BULGARIA,
		CCODE_CANADA,
		CCODE_CHILE,
		CCODE_CHINA,
		CCODE_COLOMBIA,
		CCODE_COSTA_RICA,
		CCODE_CROATIA,
		CCODE_CYPRUS,
		CCODE_CZECH,
		CCODE_DENMARK,
		CCODE_DOMINICAN_REPUBLIC,
		CCODE_ECUADOR,
		CCODE_EGYPT,
		CCODE_EL_SALVADOR,
		CCODE_ESTONIA,
		CCODE_FINLAND,
		CCODE_FRANCE,
		CCODE_GERMANY,
		CCODE_GREECE,
		CCODE_GEORGIA,
		CCODE_GUATEMALA,
		CCODE_HONDURAS,
		CCODE_HONG_KONG,
		CCODE_HUNGARY,
		CCODE_ICELAND,
		CCODE_INDIA,
		CCODE_INDONESIA,
		CCODE_IRAN,
		CCODE_IRELAND,
		CCODE_ITALY,
		CCODE_ISRAEL,
		CCODE_JAPAN,
		CCODE_JORDAN,
		CCODE_KAZAKHSTAN,
		CCODE_KUWAIT,
		CCODE_LATVIA,
		CCODE_LEBANON,
		CCODE_LEICHTENSTEIN,
		CCODE_LITHUANIA,
		CCODE_LUXEMBURG,
		CCODE_MACAU,
		CCODE_MACEDONIA,
		CCODE_MALTA,
		CCODE_MALAYSIA,
		CCODE_MEXICO,
		CCODE_MONACO,
		CCODE_MOROCCO,
		CCODE_NETHERLANDS,
		CCODE_NEW_ZEALAND,
		CCODE_NORTH_KOREA,
		CCODE_NORWAY,
		CCODE_OMAN,
		CCODE_PAKISTAN,
		CCODE_PANAMA,
		CCODE_PERU,
		CCODE_PHILIPPINES,
		CCODE_POLAND,
		CCODE_PORTUGAL,
		CCODE_PUERTO_RICO,
		CCODE_QATAR,
		CCODE_ROMANIA,
		CCODE_RUSSIA,
		CCODE_SAUDI_ARABIA,
		CCODE_SINGAPORE,
		CCODE_SLOVAKIA,
		CCODE_SLOVENIA,
		CCODE_SOUTH_AFRICA,
		CCODE_SOUTH_KOREA,
		CCODE_SPAIN,
		CCODE_SWEDEN,
		CCODE_SWITZERLAND,
		CCODE_SYRIA,
		CCODE_TAIWAN,
		CCODE_THAILAND,
		CCODE_TRINIDAD_TOBAGO,
		CCODE_TUNISIA,
		CCODE_TURKEY,
		CCODE_UK,
		CCODE_UKRAINE,
		CCODE_UNITED_ARAB_EMIRATES,
		CCODE_UNITED_STATES,
		CCODE_URUGUAY,
		CCODE_UZBEKISTAN,
		CCODE_VENEZUELA,
		CCODE_VIETNAM,
		CCODE_YEMEN,
		CCODE_ZIMBABWE,
		CCODE_JAPAN_W52_W53,
		CCODE_MAX
		} COUNTRY_CODE;

		/************************************************************************
		* Function prototype
		************************************************************************/
		#endif /* __COUNTRY_H__ */

drivers/staging/vt6656/device.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -481,9 +481,6 @@ struct vnt_private {
		u8 byBBRxConf;

		u8 byZoneType;
		int bZoneRegExist;

		u8 byOriginalZonetype;

		int bLinkPass; /* link status: OK or fail */
		struct vnt_cmd_card_init init_command;

Admin message