This patch changes the recent updates to dma-debug to conform with
coding style guidelines of Linux and the -tip tree.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
static ssize_t filter_read(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos)
{
static ssize_t filter_read(struct file *file, char __user *user_buf,
size_t count, loff_t *ppos)
{
char buf[NAME_MAX_LEN + 1];
char buf[NAME_MAX_LEN + 1];
int len;
if (!current_driver_name[0])
int len;
if (!current_driver_name[0])
static ssize_t filter_write(struct file *file, const char __user *userbuf,
size_t count, loff_t *ppos)
{
static ssize_t filter_write(struct file *file, const char __user *userbuf,
size_t count, loff_t *ppos)
{
- size_t len = NAME_MAX_LEN - 1;
+ unsigned long flags;
+ size_t len;
* disabled. Since copy_from_user can fault and may sleep we
* need to copy to temporary buffer first
*/
* disabled. Since copy_from_user can fault and may sleep we
* need to copy to temporary buffer first
*/
+ len = min(count, NAME_MAX_LEN - 1);
if (copy_from_user(buf, userbuf, len))
return -EFAULT;
if (copy_from_user(buf, userbuf, len))
return -EFAULT;
static int get_nr_mapped_entries(struct device *dev, struct scatterlist *s)
{
static int get_nr_mapped_entries(struct device *dev, struct scatterlist *s)
{
- struct dma_debug_entry *entry;
+ struct dma_debug_entry *entry, ref;
struct hash_bucket *bucket;
unsigned long flags;
struct hash_bucket *bucket;
unsigned long flags;
- int mapped_ents = 0;
- struct dma_debug_entry ref;
ref.dev_addr = sg_dma_address(s);
ref.dev_addr = sg_dma_address(s);
- ref.size = sg_dma_len(s),
+ ref.size = sg_dma_len(s),
+
+ bucket = get_hash_bucket(&ref, &flags);
+ entry = hash_bucket_find(bucket, &ref);
+ mapped_ents = 0;
- bucket = get_hash_bucket(&ref, &flags);
- entry = hash_bucket_find(bucket, &ref);
if (entry)
mapped_ents = entry->sg_mapped_ents;
put_hash_bucket(bucket, &flags);
if (entry)
mapped_ents = entry->sg_mapped_ents;
put_hash_bucket(bucket, &flags);