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

Commit 7afa1467 authored by Stefan Richter's avatar Stefan Richter Committed by Jody McIntyre
Browse files

Remove version strings from eth1394, ohci1394, sbp2. 


Their version information is not trustworthy.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarJody McIntyre <scjody@modernduck.com>
parent a237f35f

drivers/ieee1394/eth1394.c

+0 −8
Original line number Diff line number Diff line
@@ -88,9 +88,6 @@ 
	printk(KERN_ERR "%s:%s[%d]: " fmt "\n", driver_name, __FUNCTION__, __LINE__, ## args)

#define TRACE() printk(KERN_ERR "%s:%s[%d] ---- TRACE\n", driver_name, __FUNCTION__, __LINE__)



static char version[] __devinitdata =

	"$Rev: 1312 $ Ben Collins <bcollins@debian.org>";



struct fragment_info {

	struct list_head list;

	int offset;
@@ -566,7 +563,6 @@ static void ether1394_add_host (struct hpsb_host *host) 
	struct eth1394_host_info *hi = NULL;

	struct net_device *dev = NULL;

	struct eth1394_priv *priv;

	static int version_printed = 0;

	u64 fifo_addr;



	if (!(host->config_roms & HPSB_CONFIG_ROM_ENTRY_IP1394))
@@ -581,9 +577,6 @@ static void ether1394_add_host (struct hpsb_host *host) 
	if (fifo_addr == ~0ULL)

		goto out;



	if (version_printed++ == 0)

		ETH1394_PRINT_G (KERN_INFO, "%s\n", version);



	/* We should really have our own alloc_hpsbdev() function in

	 * net_init.c instead of calling the one for ethernet then hijacking

	 * it for ourselves.  That way we'd be a real networking device. */
@@ -1768,7 +1761,6 @@ fail: 
static void ether1394_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)

{

	strcpy (info->driver, driver_name);

	strcpy (info->version, "$Rev: 1312 $");

	/* FIXME XXX provide sane businfo */

	strcpy (info->bus_info, "ieee1394");

}

drivers/ieee1394/ohci1394.c

+0 −8
Original line number Diff line number Diff line
@@ -161,9 +161,6 @@ printk(level "%s: " fmt "\n" , OHCI1394_DRIVER_NAME , ## args) 
#define PRINT(level, fmt, args...) \

printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)



static char version[] __devinitdata =

	"$Rev: 1313 $ Ben Collins <bcollins@debian.org>";



/* Module Parameters */

static int phys_dma = 1;

module_param(phys_dma, int, 0644);
@@ -3215,15 +3212,10 @@ do { \ 
static int __devinit ohci1394_pci_probe(struct pci_dev *dev,

					const struct pci_device_id *ent)

{

	static int version_printed = 0;



	struct hpsb_host *host;

	struct ti_ohci *ohci;	/* shortcut to currently handled device */

	unsigned long ohci_base;



	if (version_printed++ == 0)

		PRINT_G(KERN_INFO, "%s", version);



        if (pci_enable_device(dev))

		FAIL(-ENXIO, "Failed to enable OHCI hardware");

        pci_set_master(dev);

drivers/ieee1394/sbp2.c

+0 −5
Original line number Diff line number Diff line
@@ -80,9 +80,6 @@ 
#include "ieee1394_transactions.h"

#include "sbp2.h"



static char version[] __devinitdata =

	"$Rev: 1306 $ Ben Collins <bcollins@debian.org>";



/*

 * Module load parameter definitions

 */
@@ -2696,8 +2693,6 @@ static int sbp2_module_init(void) 


	SBP2_DEBUG("sbp2_module_init");



	printk(KERN_INFO "sbp2: %s\n", version);



	/* Module load debug option to force one command at a time (serializing I/O) */

	if (serialize_io) {

		SBP2_INFO("Driver forced to serialize I/O (serialize_io=1)");