aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimur Tabi <timur@freescale.com>2011-09-15 17:44:48 -0400
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2011-09-18 16:08:56 -0400
commit4a64e49df282d55754f9bbb5f14ca4d783128df4 (patch)
tree7df5043e77795a34b0bab3e551545bdce33d10f7
parent154152aeea2c5ee4fd01b842257f5cb562234834 (diff)
drivers/video: fsl-diu-fb: remove unused ioctls
Remove some unused ioctl commands, and treat those commands as unsupported instead of ignored. Also remove struct mfb_alpha, which isn't used by any ioctl. It may have been once intended for MFB_SET_ALPHA, but that ioctl uses a different data structure. Signed-off-by: Timur Tabi <timur@freescale.com> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
-rw-r--r--drivers/video/fsl-diu-fb.c12
-rw-r--r--include/linux/fsl-diu-fb.h5
2 files changed, 0 insertions, 17 deletions
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 10ee411df3cf..226f4bc345d5 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -902,9 +902,6 @@ static int fsl_diu_setcolreg(unsigned int regno, unsigned int red,
902 ret = 0; 902 ret = 0;
903 } 903 }
904 break; 904 break;
905 case FB_VISUAL_STATIC_PSEUDOCOLOR:
906 case FB_VISUAL_PSEUDOCOLOR:
907 break;
908 } 905 }
909 906
910 return ret; 907 return ret;
@@ -1056,15 +1053,6 @@ static int fsl_diu_ioctl(struct fb_info *info, unsigned int cmd,
1056 if (copy_to_user(buf, ad, sizeof(*ad))) 1053 if (copy_to_user(buf, ad, sizeof(*ad)))
1057 return -EFAULT; 1054 return -EFAULT;
1058 break; 1055 break;
1059 case FBIOGET_HWCINFO:
1060 pr_debug("FBIOGET_HWCINFO:0x%08x\n", FBIOGET_HWCINFO);
1061 break;
1062 case FBIOPUT_MODEINFO:
1063 pr_debug("FBIOPUT_MODEINFO:0x%08x\n", FBIOPUT_MODEINFO);
1064 break;
1065 case FBIOGET_DISPINFO:
1066 pr_debug("FBIOGET_DISPINFO:0x%08x\n", FBIOGET_DISPINFO);
1067 break;
1068 1056
1069 default: 1057 default:
1070 dev_err(info->dev, "unknown ioctl command (0x%08X)\n", cmd); 1058 dev_err(info->dev, "unknown ioctl command (0x%08X)\n", cmd);
diff --git a/include/linux/fsl-diu-fb.h b/include/linux/fsl-diu-fb.h
index daa9952d2174..5ebffa69a0f6 100644
--- a/include/linux/fsl-diu-fb.h
+++ b/include/linux/fsl-diu-fb.h
@@ -27,11 +27,6 @@
27 27
28#include <linux/types.h> 28#include <linux/types.h>
29 29
30struct mfb_alpha {
31 int enable;
32 int alpha;
33};
34
35struct mfb_chroma_key { 30struct mfb_chroma_key {
36 int enable; 31 int enable;
37 __u8 red_max; 32 __u8 red_max;