diff options
author | David Milburn <dmilburn@redhat.com> | 2013-05-23 17:23:45 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2013-11-08 11:10:28 -0500 |
commit | c8afd0dcbd14e2352258f2e2d359b36d0edd459f (patch) | |
tree | d65bcd976eb1d9e8020ceb894c46f21c9eadd501 /drivers/block/mtip32xx | |
parent | 8f8b899563f28ef26e381a6eb90d12dead77389f (diff) |
mtip32xx: dynamically allocate buffer in debugfs functions
Dynamically allocate buf to prevent warnings:
drivers/block/mtip32xx/mtip32xx.c: In function ‘mtip_hw_read_device_status’:
drivers/block/mtip32xx/mtip32xx.c:2823: warning: the frame size of 1056 bytes is larger than 1024 bytes
drivers/block/mtip32xx/mtip32xx.c: In function ‘mtip_hw_read_registers’:
drivers/block/mtip32xx/mtip32xx.c:2894: warning: the frame size of 1056 bytes is larger than 1024 bytes
drivers/block/mtip32xx/mtip32xx.c: In function ‘mtip_hw_read_flags’:
drivers/block/mtip32xx/mtip32xx.c:2917: warning: the frame size of 1056 bytes is larger than 1024 bytes
Signed-off-by: David Milburn <dmilburn@redhat.com>
Acked-by: Asai Thambi S P <asamymuthupa@micron.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/mtip32xx')
-rw-r--r-- | drivers/block/mtip32xx/mtip32xx.c | 47 |
1 files changed, 37 insertions, 10 deletions
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c index 76f3bc4f0c21..050c71267f14 100644 --- a/drivers/block/mtip32xx/mtip32xx.c +++ b/drivers/block/mtip32xx/mtip32xx.c | |||
@@ -2809,34 +2809,51 @@ static ssize_t show_device_status(struct device_driver *drv, char *buf) | |||
2809 | static ssize_t mtip_hw_read_device_status(struct file *f, char __user *ubuf, | 2809 | static ssize_t mtip_hw_read_device_status(struct file *f, char __user *ubuf, |
2810 | size_t len, loff_t *offset) | 2810 | size_t len, loff_t *offset) |
2811 | { | 2811 | { |
2812 | struct driver_data *dd = (struct driver_data *)f->private_data; | ||
2812 | int size = *offset; | 2813 | int size = *offset; |
2813 | char buf[MTIP_DFS_MAX_BUF_SIZE]; | 2814 | char *buf; |
2815 | int rv = 0; | ||
2814 | 2816 | ||
2815 | if (!len || *offset) | 2817 | if (!len || *offset) |
2816 | return 0; | 2818 | return 0; |
2817 | 2819 | ||
2820 | buf = kzalloc(MTIP_DFS_MAX_BUF_SIZE, GFP_KERNEL); | ||
2821 | if (!buf) { | ||
2822 | dev_err(&dd->pdev->dev, | ||
2823 | "Memory allocation: status buffer\n"); | ||
2824 | return -ENOMEM; | ||
2825 | } | ||
2826 | |||
2818 | size += show_device_status(NULL, buf); | 2827 | size += show_device_status(NULL, buf); |
2819 | 2828 | ||
2820 | *offset = size <= len ? size : len; | 2829 | *offset = size <= len ? size : len; |
2821 | size = copy_to_user(ubuf, buf, *offset); | 2830 | size = copy_to_user(ubuf, buf, *offset); |
2822 | if (size) | 2831 | if (size) |
2823 | return -EFAULT; | 2832 | rv = -EFAULT; |
2824 | 2833 | ||
2825 | return *offset; | 2834 | kfree(buf); |
2835 | return rv ? rv : *offset; | ||
2826 | } | 2836 | } |
2827 | 2837 | ||
2828 | static ssize_t mtip_hw_read_registers(struct file *f, char __user *ubuf, | 2838 | static ssize_t mtip_hw_read_registers(struct file *f, char __user *ubuf, |
2829 | size_t len, loff_t *offset) | 2839 | size_t len, loff_t *offset) |
2830 | { | 2840 | { |
2831 | struct driver_data *dd = (struct driver_data *)f->private_data; | 2841 | struct driver_data *dd = (struct driver_data *)f->private_data; |
2832 | char buf[MTIP_DFS_MAX_BUF_SIZE]; | 2842 | char *buf; |
2833 | u32 group_allocated; | 2843 | u32 group_allocated; |
2834 | int size = *offset; | 2844 | int size = *offset; |
2835 | int n; | 2845 | int n, rv = 0; |
2836 | 2846 | ||
2837 | if (!len || size) | 2847 | if (!len || size) |
2838 | return 0; | 2848 | return 0; |
2839 | 2849 | ||
2850 | buf = kzalloc(MTIP_DFS_MAX_BUF_SIZE, GFP_KERNEL); | ||
2851 | if (!buf) { | ||
2852 | dev_err(&dd->pdev->dev, | ||
2853 | "Memory allocation: register buffer\n"); | ||
2854 | return -ENOMEM; | ||
2855 | } | ||
2856 | |||
2840 | size += sprintf(&buf[size], "H/ S ACTive : [ 0x"); | 2857 | size += sprintf(&buf[size], "H/ S ACTive : [ 0x"); |
2841 | 2858 | ||
2842 | for (n = dd->slot_groups-1; n >= 0; n--) | 2859 | for (n = dd->slot_groups-1; n >= 0; n--) |
@@ -2891,21 +2908,30 @@ static ssize_t mtip_hw_read_registers(struct file *f, char __user *ubuf, | |||
2891 | *offset = size <= len ? size : len; | 2908 | *offset = size <= len ? size : len; |
2892 | size = copy_to_user(ubuf, buf, *offset); | 2909 | size = copy_to_user(ubuf, buf, *offset); |
2893 | if (size) | 2910 | if (size) |
2894 | return -EFAULT; | 2911 | rv = -EFAULT; |
2895 | 2912 | ||
2896 | return *offset; | 2913 | kfree(buf); |
2914 | return rv ? rv : *offset; | ||
2897 | } | 2915 | } |
2898 | 2916 | ||
2899 | static ssize_t mtip_hw_read_flags(struct file *f, char __user *ubuf, | 2917 | static ssize_t mtip_hw_read_flags(struct file *f, char __user *ubuf, |
2900 | size_t len, loff_t *offset) | 2918 | size_t len, loff_t *offset) |
2901 | { | 2919 | { |
2902 | struct driver_data *dd = (struct driver_data *)f->private_data; | 2920 | struct driver_data *dd = (struct driver_data *)f->private_data; |
2903 | char buf[MTIP_DFS_MAX_BUF_SIZE]; | 2921 | char *buf; |
2904 | int size = *offset; | 2922 | int size = *offset; |
2923 | int rv = 0; | ||
2905 | 2924 | ||
2906 | if (!len || size) | 2925 | if (!len || size) |
2907 | return 0; | 2926 | return 0; |
2908 | 2927 | ||
2928 | buf = kzalloc(MTIP_DFS_MAX_BUF_SIZE, GFP_KERNEL); | ||
2929 | if (!buf) { | ||
2930 | dev_err(&dd->pdev->dev, | ||
2931 | "Memory allocation: flag buffer\n"); | ||
2932 | return -ENOMEM; | ||
2933 | } | ||
2934 | |||
2909 | size += sprintf(&buf[size], "Flag-port : [ %08lX ]\n", | 2935 | size += sprintf(&buf[size], "Flag-port : [ %08lX ]\n", |
2910 | dd->port->flags); | 2936 | dd->port->flags); |
2911 | size += sprintf(&buf[size], "Flag-dd : [ %08lX ]\n", | 2937 | size += sprintf(&buf[size], "Flag-dd : [ %08lX ]\n", |
@@ -2914,9 +2940,10 @@ static ssize_t mtip_hw_read_flags(struct file *f, char __user *ubuf, | |||
2914 | *offset = size <= len ? size : len; | 2940 | *offset = size <= len ? size : len; |
2915 | size = copy_to_user(ubuf, buf, *offset); | 2941 | size = copy_to_user(ubuf, buf, *offset); |
2916 | if (size) | 2942 | if (size) |
2917 | return -EFAULT; | 2943 | rv = -EFAULT; |
2918 | 2944 | ||
2919 | return *offset; | 2945 | kfree(buf); |
2946 | return rv ? rv : *offset; | ||
2920 | } | 2947 | } |
2921 | 2948 | ||
2922 | static const struct file_operations mtip_device_status_fops = { | 2949 | static const struct file_operations mtip_device_status_fops = { |