From 8e995d4e14b8ee6853aff43b75ed29e57a670fc0 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 15 Jun 2014 14:57:57 +0200 Subject: [PATCH] backports: fix a compile warning in devnode The mode parameter type was changed in the callback function devnode in struct device_type. commit 2c9ede55ecec58099b72e4bb8eab719f32f72c31 Author: Al Viro Date: Sat Jul 23 20:24:48 2011 -0400 switch device_get_devnode() and ->devnode() to umode_t * Signed-off-by: Hauke Mehrtens --- .../media/0003-devnode_param_type/INFO | 8 ++++++++ .../media/0003-devnode_param_type/ddbridge.patch | 14 ++++++++++++++ .../media/0003-devnode_param_type/dvb-core.patch | 14 ++++++++++++++ .../media/0003-devnode_param_type/rc.patch | 14 ++++++++++++++ 4 files changed, 50 insertions(+) create mode 100644 patches/collateral-evolutions/media/0003-devnode_param_type/INFO create mode 100644 patches/collateral-evolutions/media/0003-devnode_param_type/ddbridge.patch create mode 100644 patches/collateral-evolutions/media/0003-devnode_param_type/dvb-core.patch create mode 100644 patches/collateral-evolutions/media/0003-devnode_param_type/rc.patch diff --git a/patches/collateral-evolutions/media/0003-devnode_param_type/INFO b/patches/collateral-evolutions/media/0003-devnode_param_type/INFO new file mode 100644 index 000000000000..192cfb87d972 --- /dev/null +++ b/patches/collateral-evolutions/media/0003-devnode_param_type/INFO @@ -0,0 +1,8 @@ +The mode parameter type was changed in the callback function devnode in +struct device_type. + +commit 2c9ede55ecec58099b72e4bb8eab719f32f72c31 +Author: Al Viro +Date: Sat Jul 23 20:24:48 2011 -0400 + + switch device_get_devnode() and ->devnode() to umode_t * diff --git a/patches/collateral-evolutions/media/0003-devnode_param_type/ddbridge.patch b/patches/collateral-evolutions/media/0003-devnode_param_type/ddbridge.patch new file mode 100644 index 000000000000..6dd182ba5136 --- /dev/null +++ b/patches/collateral-evolutions/media/0003-devnode_param_type/ddbridge.patch @@ -0,0 +1,14 @@ +--- a/drivers/media/pci/ddbridge/ddbridge-core.c ++++ b/drivers/media/pci/ddbridge/ddbridge-core.c +@@ -1479,7 +1479,11 @@ static const struct file_operations ddb_ + .open = ddb_open, + }; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) + static char *ddb_devnode(struct device *device, umode_t *mode) ++#else ++static char *ddb_devnode(struct device *device, mode_t *mode) ++#endif + { + struct ddb *dev = dev_get_drvdata(device); + diff --git a/patches/collateral-evolutions/media/0003-devnode_param_type/dvb-core.patch b/patches/collateral-evolutions/media/0003-devnode_param_type/dvb-core.patch new file mode 100644 index 000000000000..3b4385e8c231 --- /dev/null +++ b/patches/collateral-evolutions/media/0003-devnode_param_type/dvb-core.patch @@ -0,0 +1,14 @@ +--- a/drivers/media/dvb-core/dvbdev.c ++++ b/drivers/media/dvb-core/dvbdev.c +@@ -442,7 +442,11 @@ static int dvb_uevent(struct device *dev + return 0; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) + static char *dvb_devnode(struct device *dev, umode_t *mode) ++#else ++static char *dvb_devnode(struct device *dev, mode_t *mode) ++#endif + { + struct dvb_device *dvbdev = dev_get_drvdata(dev); + diff --git a/patches/collateral-evolutions/media/0003-devnode_param_type/rc.patch b/patches/collateral-evolutions/media/0003-devnode_param_type/rc.patch new file mode 100644 index 000000000000..38acfda175c3 --- /dev/null +++ b/patches/collateral-evolutions/media/0003-devnode_param_type/rc.patch @@ -0,0 +1,14 @@ +--- a/drivers/media/rc/rc-main.c ++++ b/drivers/media/rc/rc-main.c +@@ -755,7 +755,11 @@ static void ir_close(struct input_dev *i + } + + /* class for /sys/class/rc */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) + static char *rc_devnode(struct device *dev, umode_t *mode) ++#else ++static char *rc_devnode(struct device *dev, mode_t *mode) ++#endif + { + return kasprintf(GFP_KERNEL, "rc/%s", dev_name(dev)); + } -- 2.30.2