Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46510b56 authored by Thierry MERLE's avatar Thierry MERLE Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (9155): em28xx-dvb: dvb_init() code factorization 



In dvb_init(),
        case EM2880_BOARD_TERRATEC_HYBRID_XS:
        case EM2880_BOARD_KWORLD_DVB_310U:
can be put in the same case than EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900
since they do the same thing.

Signed-off-by: default avatarThierry MERLE <thierry.merle@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b4be2048

drivers/media/video/em28xx/em28xx-dvb.c

+2 −18
Original line number Diff line number Diff line
@@ -421,6 +421,8 @@ static int dvb_init(struct em28xx *dev) 
		}

		break;

	case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:

	case EM2880_BOARD_TERRATEC_HYBRID_XS:

	case EM2880_BOARD_KWORLD_DVB_310U:

		dvb->frontend = dvb_attach(zl10353_attach,

					   &em28xx_zl10353_with_xc3028,

					   &dev->i2c_adap);
@@ -442,24 +444,6 @@ static int dvb_init(struct em28xx *dev) 
		}

		break;

#endif

	case EM2880_BOARD_TERRATEC_HYBRID_XS:

		dvb->frontend = dvb_attach(zl10353_attach,

						&em28xx_zl10353_with_xc3028,

						&dev->i2c_adap);

		if (attach_xc3028(0x61, dev) < 0) {

			 result = -EINVAL;

			goto out_free;

		}

		break;

	case EM2880_BOARD_KWORLD_DVB_310U:

		dvb->frontend = dvb_attach(zl10353_attach,

						&em28xx_zl10353_with_xc3028,

						&dev->i2c_adap);

		if (attach_xc3028(0x61, dev) < 0) {

			result = -EINVAL;

			goto out_free;

		}

		break;

	default:

		printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card"

				" isn't supported yet\n",