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

Commit 91bd2855 authored by Andrew F. Davis's avatar Andrew F. Davis Committed by Greg Kroah-Hartman
Browse files

w1: Remove unneeded use of assert() and remove w1_log.h 



The only use of assert() is in matrox_w1.c and is used to check the input
to probe() from the PCI subsystem for NULL values, these are guaranteed
to be populated and no other PCI driver makes this check, remove this.

As this was the only definition in w1_log.h, remove this also.

Signed-off-by: default avatarAndrew F. Davis <afd@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b04e0854

drivers/w1/masters/matrox_w1.c

+0 −6
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 


#include "../w1.h"

#include "../w1_int.h"

#include "../w1_log.h"



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>");
@@ -157,9 +156,6 @@ static int matrox_w1_probe(struct pci_dev *pdev, const struct pci_device_id *ent 
	struct matrox_device *dev;

	int err;



	assert(pdev != NULL);

	assert(ent != NULL);



	if (pdev->vendor != PCI_VENDOR_ID_MATROX || pdev->device != PCI_DEVICE_ID_MATROX_G400)

		return -ENODEV;
@@ -224,8 +220,6 @@ static void matrox_w1_remove(struct pci_dev *pdev) 
{

	struct matrox_device *dev = pci_get_drvdata(pdev);



	assert(dev != NULL);



	if (dev->found) {

		w1_remove_master_device(dev->bus_master);

		iounmap(dev->virt_addr);

drivers/w1/w1.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/atomic.h>



#include "w1.h"

#include "w1_log.h"

#include "w1_int.h"

#include "w1_family.h"

#include "w1_netlink.h"

drivers/w1/w1_int.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/moduleparam.h>



#include "w1.h"

#include "w1_log.h"

#include "w1_netlink.h"

#include "w1_int.h"

drivers/w1/w1_io.c

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/module.h>



#include "w1.h"

#include "w1_log.h"



static int w1_delay_parm = 1;

module_param_named(delay_coef, w1_delay_parm, int, 0);

drivers/w1/w1_log.h

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2004 Evgeniy Polyakov <zbr@ioremap.net>

 *

 * 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.  See the

 * GNU General Public License for more details.

 */



#ifndef __W1_LOG_H

#define __W1_LOG_H



#define DEBUG



#ifdef W1_DEBUG

#  define assert(expr) do {} while (0)

#else

#  define assert(expr) \

        if(unlikely(!(expr))) {				        \

		pr_err("Assertion failed! %s,%s,%s,line=%d\n",	\

		#expr, __FILE__, __func__, __LINE__);		\

        }

#endif



#endif /* __W1_LOG_H */