Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3f3b1f2 authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

staging: unisys: remove timskmodutils.h 



Remove the entire timskmodutils.h file as it had a lot of checkpatch.pl
strict warnings and checks, and nearly all of the functions were not used
anywhere.

The unisys_spar_platform variable was moved to timskmod.h. References to the
removed timskmodutils.h were switched to timskmod.h instead. The unused
visor_seq_file_new_buffer() and visor_seq_file_done_buffer() functions defined
in timskmodutils.h were implemented in visorkmodutils.c, so these were removed
as well.

This patch will generate a warning about updating MAINTAINERS, but there does
not seem to be any need for that.

Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 69ee73aa

drivers/staging/unisys/channels/chanstub.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


#include "channel.h"

#include "chanstub.h"

#include "timskmodutils.h"

#include "timskmod.h"

#include "version.h"



static __init int

drivers/staging/unisys/include/timskmod.h

+1 −1
Original line number Diff line number Diff line
@@ -178,6 +178,6 @@ static inline struct cdev *cdev_alloc_init(struct module *owner, 
	return cdev;

}



#include "timskmodutils.h"

extern int unisys_spar_platform;



#endif

drivers/staging/unisys/include/timskmodutils.h

deleted100644 → 0
+0 −77
Original line number Diff line number Diff line 
/* timskmodutils.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 __TIMSKMODUTILS_H__

#define __TIMSKMODUTILS_H__



#include "timskmod.h"



void *kmalloc_kernel(size_t siz);

void  myprintk(const char *myDrvName, const char *devname,

		const char *template, ...);



/*--------------------------------*

 *---  GENERAL MESSAGEQ STUFF  ---*

 *--------------------------------*/



struct MessageQEntry;



/** the data structure used to hold an arbitrary data item that you want

 *  to place on a #MESSAGEQ.  Declare and initialize as follows:

 *

 *  This structure should be considered opaque; the client using it should

 *  never access the fields directly.

 *  Refer to these functions for more info:

 *

 *  @ingroup messageq

 */

typedef struct MessageQEntry {

	void *data;

	struct MessageQEntry *qNext;

	struct MessageQEntry *qPrev;

} MESSAGEQENTRY;



/** the data structure used to hold a FIFO queue of #MESSAGEQENTRY<b></b>s.

 *  Declare and initialize as follows:

 *  @code

 *      MESSAGEQ myQueue;

 *  @endcode

 *  This structure should be considered opaque; the client using it should

 *  never access the fields directly.

 *  Refer to these functions for more info:

 *

 *  @ingroup messageq

 */

typedef struct MessageQ {

	MESSAGEQENTRY *qHead;

	MESSAGEQENTRY *qTail;

	struct semaphore nQEntries;

	spinlock_t       queueLock;

} MESSAGEQ;



char *cyclesToSeconds(u64 cycles, u64 cyclesPerSecond,

		      char *buf, size_t bufsize);

char *cyclesToIterationSeconds(u64 cycles, u64 cyclesPerSecond,

			       u64 iterations, char *buf, size_t bufsize);

char *cyclesToSomethingsPerSecond(u64 cycles, u64 cyclesPerSecond,

				  u64 somethings, char *buf, size_t bufsize);

struct seq_file *visor_seq_file_new_buffer(void *buf, size_t buf_size);

void visor_seq_file_done_buffer(struct seq_file *m);



extern int unisys_spar_platform;



#endif

drivers/staging/unisys/virtpci/virtpci.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#include <linux/debugfs.h>

#include "version.h"

#include "guestlinuxdebug.h"

#include "timskmodutils.h"

#include "timskmod.h"



struct driver_private {

	struct kobject kobj;

drivers/staging/unisys/visorutil/visorkmodutils.c

+0 −40
Original line number Diff line number Diff line
@@ -46,46 +46,6 @@ void *kmalloc_kernel(size_t siz) 
	return kmalloc(siz, GFP_KERNEL | __GFP_NORETRY);

}



/*  Use these handy-dandy seq_file_xxx functions if you want to call some

 *  functions that write stuff into a seq_file, but you actually just want

 *  to dump that output into a buffer.  Use them as follows:

 *  - call visor_seq_file_new_buffer to create the seq_file (you supply the buf)

 *  - call whatever functions you want that take a seq_file as an argument

 *    (the buf you supplied will get the output data)

 *  - call visor_seq_file_done_buffer to dispose of your seq_file

 */

struct seq_file *visor_seq_file_new_buffer(void *buf, size_t buf_size)

{

	struct seq_file *rc = NULL;

	struct seq_file *m = kmalloc_kernel(sizeof(struct seq_file));



	if (m == NULL) {

		rc = NULL;

		goto Away;

	}

	memset(m, 0, sizeof(struct seq_file));

	m->buf = buf;

	m->size = buf_size;

	rc = m;

Away:

	if (rc == NULL) {

		visor_seq_file_done_buffer(m);

		m = NULL;

	}

	return rc;

}

EXPORT_SYMBOL_GPL(visor_seq_file_new_buffer);







void visor_seq_file_done_buffer(struct seq_file *m)

{

	if (!m)

		return;

	kfree(m);

}

EXPORT_SYMBOL_GPL(visor_seq_file_done_buffer);



static __init uint32_t

visorutil_spar_detect(void)

{