V4L/DVB: msp3400: remove obsolete v4l2-i2c-drv.h header (61a489c8) · Commits · 戴 / test

drivers/media/video/msp3400-driver.c

+23 −8

Original line number	Diff line number	Diff line
		@@ -56,7 +56,6 @@
		#include <linux/videodev2.h>
		#include <media/v4l2-device.h>
		#include <media/v4l2-ioctl.h>
		#include <media/v4l2-i2c-drv.h>
		#include <media/msp3400.h>
		#include <media/tvaudio.h>
		#include "msp3400-driver.h"
		@@ -843,8 +842,11 @@ static const struct i2c_device_id msp_id[] = {
		};
		MODULE_DEVICE_TABLE(i2c, msp_id);

		static struct v4l2_i2c_driver_data v4l2_i2c_data = {
		static struct i2c_driver msp_driver = {
		.driver = {
		.owner = THIS_MODULE,
		.name = "msp3400",
		},
		.probe = msp_probe,
		.remove = msp_remove,
		.suspend = msp_suspend,
		@@ -852,6 +854,19 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
		.id_table = msp_id,
		};

		static __init int init_msp(void)
		{
		return i2c_add_driver(&msp_driver);
		}

		static __exit void exit_msp(void)
		{
		i2c_del_driver(&msp_driver);
		}

		module_init(init_msp);
		module_exit(exit_msp);

		/*
		* Overrides for Emacs so that we follow Linus's tabbing style.
		* ---------------------------------------------------------------------------