Commit 01d86042 authored by Takashi Sakamoto's avatar Takashi Sakamoto
Browse files

Revert "firewire: core: option to log bus reset initiation" 

This reverts commit 6732491243045f5a7e1995b4be5f3c964b579ebd.

The former commit adds some alternative tracepoints events to replace the
reverted kernel log messages.

Link: https://lore.kernel.org/r/20240501073238.72769-5-o-takashi@sakamocchi.jp


Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
parent 08dd8602

drivers/firewire/core-card.c

+0 −10
Original line number Diff line number Diff line
@@ -224,10 +224,6 @@ static int reset_bus(struct fw_card *card, bool short_reset) 


	trace_bus_reset_initiate(card->generation, short_reset);



	if (unlikely(fw_core_param_debug & FW_CORE_PARAM_DEBUG_BUSRESETS))

		fw_notice(card, "initiating %s bus reset\n",

		          short_reset ? "short" : "long");



	return card->driver->update_phy_reg(card, reg, 0, bit);

}
@@ -235,10 +231,6 @@ void fw_schedule_bus_reset(struct fw_card *card, bool delayed, bool short_reset) 
{

	trace_bus_reset_schedule(card->generation, short_reset);



	if (unlikely(fw_core_param_debug & FW_CORE_PARAM_DEBUG_BUSRESETS))

		fw_notice(card, "scheduling %s bus reset\n",

		          short_reset ? "short" : "long");



	/* We don't try hard to sort out requests of long vs. short resets. */

	card->br_short = short_reset;
@@ -259,8 +251,6 @@ static void br_work(struct work_struct *work) 
	    time_before64(get_jiffies_64(), card->reset_jiffies + 2 * HZ)) {

		trace_bus_reset_postpone(card->generation, card->br_short);



		if (unlikely(fw_core_param_debug & FW_CORE_PARAM_DEBUG_BUSRESETS))

			fw_notice(card, "delaying bus reset\n");

		if (!queue_delayed_work(fw_workqueue, &card->br_work, 2 * HZ))

			fw_card_put(card);

		return;

drivers/firewire/core-transaction.c

+0 −7
Original line number Diff line number Diff line
@@ -1390,12 +1390,5 @@ static void __exit fw_core_cleanup(void) 
	idr_destroy(&fw_device_idr);

}



int fw_core_param_debug;

module_param_named(debug, fw_core_param_debug, int, 0644);

MODULE_PARM_DESC(debug, "Verbose logging (default = 0"

	", bus resets = "	__stringify(FW_CORE_PARAM_DEBUG_BUSRESETS)

	")");





module_init(fw_core_init);

module_exit(fw_core_cleanup);

drivers/firewire/core.h

+0 −4
Original line number Diff line number Diff line
@@ -245,10 +245,6 @@ static inline bool tcode_is_link_internal(unsigned int tcode) 
/* OHCI-1394's default upper bound for physical DMA: 4 GB */

#define FW_MAX_PHYSICAL_RANGE		(1ULL << 32)



#define FW_CORE_PARAM_DEBUG_BUSRESETS	1



extern int fw_core_param_debug;



void fw_core_handle_request(struct fw_card *card, struct fw_packet *request);

void fw_core_handle_response(struct fw_card *card, struct fw_packet *packet);

int fw_get_response_length(struct fw_request *request);