Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 17:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: unisys: moving file.h functionality to visorchipset.h

Browse Source 
this patch simply migrates file.h functionality to visorchipset.h

Signed-off-by: Erik Arfvidson <erik.arfvidson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Erik Arfvidson 2015-05-05 18:36:12 -04:00 committed by Greg Kroah-Hartman
parent d777ba2e69
commit 95e967569d
4 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/unisys/visorchipset/file.c
View File

@ -19,13 +19,14 @@
* communicate with the visorchipset driver using a device/file interface.
*/
#include <linux/mm.h>
#include <linux/fs.h>
#include <linux/mm.h>
#include "version.h"
#include "visorchipset.h"
#include "visorbus.h"
#include "uisutils.h"
#include "file.h"
#include "visorchipset.h"
#define CURRENT_FILE_PC VISOR_CHIPSET_PC_file_c

25
drivers/staging/unisys/visorchipset/file.h
View File

@ -1,25 +0,0 @@
/* file.h
*
* Copyright (C) 2010 - 2013 UNISYS CORPORATION
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
* NON INFRINGEMENT. See the GNU General Public License for more
* details.
*/
#ifndef __FILE_H__
#define __FILE_H__
int visorchipset_file_init(dev_t majorDev,
struct visorchannel **pControlVm_channel);
void visorchipset_file_cleanup(dev_t major_dev);
#endif

4
drivers/staging/unisys/visorchipset/visorchipset.h
View File

@ -188,5 +188,7 @@ void *visorchipset_cache_alloc(struct kmem_cache *pool,
bool ok_to_block, char *fn, int ln);
void visorchipset_cache_free(struct kmem_cache *pool, void *p,
char *fn, int ln);
int visorchipset_file_init(dev_t majorDev,
struct visorchannel **pControlVm_channel);
void visorchipset_file_cleanup(dev_t major_dev);
#endif

1
drivers/staging/unisys/visorchipset/visorchipset_main.c
View File

@ -20,7 +20,6 @@
#include "procobjecttree.h"
#include "visorbus.h"
#include "periodic_work.h"
#include "file.h"
#include "parser.h"
#include "uisutils.h"
#include "controlvmcompletionstatus.h"