From: Michael Krufky <mkrufky@linuxtv.org>
Date: Sat, 21 Jun 2008 08:24:38 +0000 (-0300)
Subject: V4L/DVB (8300): sms1xxx: simplify smsusb_init_device switch..case block
X-Git-Tag: v2.6.27-rc1~966^2~73
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2708e888c57904f78649dcd91dcda9768d580ecf;p=linux-2.6

V4L/DVB (8300): sms1xxx: simplify smsusb_init_device switch..case block

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index e6ee4434a2..e7e0fe7354 100644
--- a/drivers/media/dvb/siano/smsusb.c
+++ b/drivers/media/dvb/siano/smsusb.c
@@ -281,7 +281,6 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
 {
 	struct smsdevice_params_t params;
 	struct smsusb_device_t *dev;
-	struct sms_board *board;
 	int i, rc;
 
 	/* create device object */
@@ -295,36 +294,21 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id)
 	usb_set_intfdata(intf, dev);
 	dev->udev = interface_to_usbdev(intf);
 
-	board = sms_get_board(board_id);
-
-	switch (board->type) {
+	params.device_type = sms_get_board(board_id)->type;
 
+	switch (params.device_type) {
 	case SMS_STELLAR:
 		dev->buffer_size = USB1_BUFFER_SIZE;
 
 		params.setmode_handler = smsusb1_setmode;
 		params.detectmode_handler = smsusb1_detectmode;
-		params.device_type = SMS_STELLAR;
-		sms_info("stellar device found");
 		break;
 	default:
-		switch (board->type) {
-		case SMS_NOVA_A0:
-			params.device_type = SMS_NOVA_A0;
-			sms_info("nova A0 found");
-			break;
-		case SMS_NOVA_B0:
-			params.device_type = SMS_NOVA_B0;
-			sms_info("nova B0 found");
-			break;
-		case SMS_VEGA:
-			params.device_type = SMS_VEGA;
-			sms_info("Vega found");
-			break;
-		default:
-			sms_err("Unspecified sms device type!");
-		}
-
+		sms_err("Unspecified sms device type!");
+		/* fall-thru */
+	case SMS_NOVA_A0:
+	case SMS_NOVA_B0:
+	case SMS_VEGA:
 		dev->buffer_size = USB2_BUFFER_SIZE;
 		dev->response_alignment =
 			dev->udev->ep_in[1]->desc.wMaxPacketSize -