m-chrzan.xyz
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--char.c10
-rw-r--r--harddoomdev.c2
-rw-r--r--surface.c5
3 files changed, 5 insertions, 12 deletions
diff --git a/char.c b/char.c
index c1c4f16..f10c5b5 100644
--- a/char.c
+++ b/char.c
@@ -83,7 +83,7 @@ int alloc_texture(struct doomdev_ioctl_create_texture *params,
GFP_KERNEL);
ORFAIL_NULL(texture_data->texture_cpu, -ENOMEM, error_texture);
- texture_data->page_table_cpu =
+ texture_data->page_table_cpu =
dma_alloc_coherent(texture_data->doom_data->pci_device,
pages_needed * 4, &texture_data->page_table_dev,
GFP_KERNEL);
@@ -100,7 +100,6 @@ int alloc_texture(struct doomdev_ioctl_create_texture *params,
(void __user *) params->data_ptr,
params->size);
-
if (not_written) {
err = -EFAULT;
goto error_copy;
@@ -150,7 +149,7 @@ long doom_create_texture(struct file *filp, unsigned long arg)
ORFAIL_NULL(texture_data, -ENOMEM, error_data);
doom_data = container_of(filp->f_inode->i_cdev, struct doom_data, cdev);
texture_data->doom_data = doom_data;
-
+
ORFAIL(alloc_texture(params, texture_data), error_texture);
fd = anon_inode_getfd("doom_texture", &texture_fops, texture_data, 0);
@@ -202,7 +201,6 @@ int alloc_flat(struct doomdev_ioctl_create_flat *params,
(void __user *) params->data_ptr, HARDDOOM_FLAT_SIZE);
if (not_written) {
- p("some bytes not copied\n");
err = -EFAULT;
goto error_copy;
}
@@ -237,7 +235,7 @@ long doom_create_flat(struct file *filp, unsigned long arg)
ORFAIL_NULL(flat_data, -ENOMEM, error_data);
doom_data = container_of(filp->f_inode->i_cdev, struct doom_data, cdev);
flat_data->doom_data = doom_data;
-
+
ORFAIL(alloc_flat(params, flat_data), error_flat);
fd = anon_inode_getfd("doom_texture", &flat_fops, flat_data, 0);
@@ -285,7 +283,7 @@ struct file_operations doomdev_fops = {
.compat_ioctl = doom_ioctl,
.open = doom_open
};
-
+
struct class *doom_class;
int new_doomdev(struct pci_dev *dev)
diff --git a/harddoomdev.c b/harddoomdev.c
index 26eb34e..31e0def 100644
--- a/harddoomdev.c
+++ b/harddoomdev.c
@@ -42,7 +42,7 @@ void disable_intr(void __iomem *iomem, uint32_t intr)
void send_command(struct doom_data *doom_data, uint32_t command)
{
uint32_t free;
-
+
free = doomdev_read(doom_data->iomem, HARDDOOM_FIFO_FREE);
if (free == 0) {
deactivate_intr(doom_data->iomem, HARDDOOM_INTR_PONG_ASYNC);
diff --git a/surface.c b/surface.c
index 779fd73..29530b7 100644
--- a/surface.c
+++ b/surface.c
@@ -64,8 +64,6 @@ long copy_rects(struct file *filp, unsigned long arg)
struct fd src_fds;
int i;
- p("in copy rects\n");
-
dst_data = filp->private_data;
param = (struct doomdev_surf_ioctl_copy_rects *) arg;
rects = (struct doomdev_copy_rect *) param->rects_ptr;
@@ -74,7 +72,6 @@ long copy_rects(struct file *filp, unsigned long arg)
src_data = src_fds.file->private_data;
if (dst_data->doom_data != src_data->doom_data) {
- p("copying between devices");
return -EINVAL;
}
@@ -113,7 +110,6 @@ long draw_columns(struct file *filp, unsigned long arg)
texture_data = texture_fds.file->private_data;
if (surface_data->doom_data != texture_data->doom_data) {
- p("texture from different device\n");
return -EINVAL;
}
@@ -149,7 +145,6 @@ long draw_spans(struct file *filp, unsigned long arg)
flat_data = flat_fds.file->private_data;
if (surface_data->doom_data != flat_data->doom_data) {
- p("flat from different device\n");
return -EINVAL;
}