From 95e967569dfd9bbe38bb533650c8a6bfb12f9523 Mon Sep 17 00:00:00 2001 From: Erik Arfvidson Date: Tue, 5 May 2015 18:36:12 -0400 Subject: [PATCH] staging: unisys: moving file.h functionality to visorchipset.h this patch simply migrates file.h functionality to visorchipset.h Signed-off-by: Erik Arfvidson Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- drivers/staging/unisys/visorchipset/file.c | 5 ++-- drivers/staging/unisys/visorchipset/file.h | 25 ------------------- .../unisys/visorchipset/visorchipset.h | 4 ++- .../unisys/visorchipset/visorchipset_main.c | 1 - 4 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 drivers/staging/unisys/visorchipset/file.h diff --git a/drivers/staging/unisys/visorchipset/file.c b/drivers/staging/unisys/visorchipset/file.c index 153f736dd76c..c0bd4161fb75 100644 --- a/drivers/staging/unisys/visorchipset/file.c +++ b/drivers/staging/unisys/visorchipset/file.c @@ -19,13 +19,14 @@ * communicate with the visorchipset driver using a device/file interface. */ -#include #include +#include + #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 diff --git a/drivers/staging/unisys/visorchipset/file.h b/drivers/staging/unisys/visorchipset/file.h deleted file mode 100644 index 6ff28a1ae86e..000000000000 --- a/drivers/staging/unisys/visorchipset/file.h +++ /dev/null @@ -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 diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h index dcf8a2345a59..93763ee8258b 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset.h +++ b/drivers/staging/unisys/visorchipset/visorchipset.h @@ -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 diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c index a8448c23a89b..34ac17b4a6f5 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset_main.c +++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c @@ -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" -- 2.30.2