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

Commit 96db6fa9 authored by James Bottomley's avatar James Bottomley
Browse files

[SCSI] libsas: convert to standard kernel debugging 



Instead of using a config option for debugging, just dump the
messages with KERN_DEBUG.

Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 75c0b386

drivers/scsi/libsas/Kconfig

+0 −8
Original line number Original line Diff line number Diff line
@@ -46,11 +46,3 @@ config SCSI_SAS_HOST_SMP 
		Allows sas hosts to receive SMP frames.  Selecting this

		Allows sas hosts to receive SMP frames.  Selecting this

		option builds an SMP interpreter into libsas.  Say

		option builds an SMP interpreter into libsas.  Say

		N here if you want to save the few kb this consumes.
 
		N here if you want to save the few kb this consumes.
 


config SCSI_SAS_LIBSAS_DEBUG

	bool "Compile the SAS Domain Transport Attributes in debug mode"

	default y

	depends on SCSI_SAS_LIBSAS

	help

		Compiles the SAS Layer in debug mode.  In debug mode, the

		SAS Layer prints diagnostic and debug messages.

drivers/scsi/libsas/Makefile

+0 −4
Original line number Original line Diff line number Diff line
@@ -21,10 +21,6 @@ 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307

# USA

# USA





ifeq ($(CONFIG_SCSI_SAS_LIBSAS_DEBUG),y)

	EXTRA_CFLAGS += -DSAS_DEBUG

endif



obj-$(CONFIG_SCSI_SAS_LIBSAS) += libsas.o

obj-$(CONFIG_SCSI_SAS_LIBSAS) += libsas.o

libsas-y +=  sas_init.o     \

libsas-y +=  sas_init.o     \

		sas_phy.o      \

		sas_phy.o      \

drivers/scsi/libsas/sas_dump.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -24,8 +24,6 @@ 




#include "sas_dump.h"

#include "sas_dump.h"





#ifdef SAS_DEBUG



static const char *sas_hae_str[] = {

static const char *sas_hae_str[] = {

	[0] = "HAE_RESET",

	[0] = "HAE_RESET",

};

};
@@ -72,5 +70,3 @@ void sas_dump_port(struct asd_sas_port *port) 
	SAS_DPRINTK("port%d: oob_mode:0x%x\n", port->id, port->oob_mode);

	SAS_DPRINTK("port%d: oob_mode:0x%x\n", port->id, port->oob_mode);

	SAS_DPRINTK("port%d: num_phys:%d\n", port->id, port->num_phys);

	SAS_DPRINTK("port%d: num_phys:%d\n", port->id, port->num_phys);

}
 
}
 


#endif /* SAS_DEBUG */

drivers/scsi/libsas/sas_dump.h

+0 −12
Original line number Original line Diff line number Diff line
@@ -24,19 +24,7 @@ 




#include "sas_internal.h"

#include "sas_internal.h"





#ifdef SAS_DEBUG



void sas_dprint_porte(int phyid, enum port_event pe);

void sas_dprint_porte(int phyid, enum port_event pe);

void sas_dprint_phye(int phyid, enum phy_event pe);

void sas_dprint_phye(int phyid, enum phy_event pe);

void sas_dprint_hae(struct sas_ha_struct *sas_ha, enum ha_event he);

void sas_dprint_hae(struct sas_ha_struct *sas_ha, enum ha_event he);

void sas_dump_port(struct asd_sas_port *port);
 
void sas_dump_port(struct asd_sas_port *port);
 


#else /* SAS_DEBUG */



static inline void sas_dprint_porte(int phyid, enum port_event pe) { }

static inline void sas_dprint_phye(int phyid, enum phy_event pe) { }

static inline void sas_dprint_hae(struct sas_ha_struct *sas_ha,

				  enum ha_event he) { }

static inline void sas_dump_port(struct asd_sas_port *port) { }



#endif /* SAS_DEBUG */

drivers/scsi/libsas/sas_internal.h

+1 −5
Original line number Original line Diff line number Diff line
@@ -33,11 +33,7 @@ 




#define sas_printk(fmt, ...) printk(KERN_NOTICE "sas: " fmt, ## __VA_ARGS__)

#define sas_printk(fmt, ...) printk(KERN_NOTICE "sas: " fmt, ## __VA_ARGS__)





#ifdef SAS_DEBUG

#define SAS_DPRINTK(fmt, ...) printk(KERN_DEBUG "sas: " fmt, ## __VA_ARGS__)

#define SAS_DPRINTK(fmt, ...) printk(KERN_NOTICE "sas: " fmt, ## __VA_ARGS__)

#else

#define SAS_DPRINTK(fmt, ...)

#endif





#define TO_SAS_TASK(_scsi_cmd)  ((void *)(_scsi_cmd)->host_scribble)

#define TO_SAS_TASK(_scsi_cmd)  ((void *)(_scsi_cmd)->host_scribble)

#define ASSIGN_SAS_TASK(_sc, _t) do { (_sc)->host_scribble = (void *) _t; } while (0)

#define ASSIGN_SAS_TASK(_sc, _t) do { (_sc)->host_scribble = (void *) _t; } while (0)