Skip to content

Commit 01d8604

Browse files
committed
Revert "firewire: core: option to log bus reset initiation"
This reverts commit 6732491. The former commit adds some alternative tracepoints events to replace the reverted kernel log messages. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Sakamoto <[email protected]>
1 parent 08dd860 commit 01d8604

File tree

3 files changed

+0
-21
lines changed

3 files changed

+0
-21
lines changed

drivers/firewire/core-card.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -224,21 +224,13 @@ static int reset_bus(struct fw_card *card, bool short_reset)
224224

225225
trace_bus_reset_initiate(card->generation, short_reset);
226226

227-
if (unlikely(fw_core_param_debug & FW_CORE_PARAM_DEBUG_BUSRESETS))
228-
fw_notice(card, "initiating %s bus reset\n",
229-
short_reset ? "short" : "long");
230-
231227
return card->driver->update_phy_reg(card, reg, 0, bit);
232228
}
233229

234230
void fw_schedule_bus_reset(struct fw_card *card, bool delayed, bool short_reset)
235231
{
236232
trace_bus_reset_schedule(card->generation, short_reset);
237233

238-
if (unlikely(fw_core_param_debug & FW_CORE_PARAM_DEBUG_BUSRESETS))
239-
fw_notice(card, "scheduling %s bus reset\n",
240-
short_reset ? "short" : "long");
241-
242234
/* We don't try hard to sort out requests of long vs. short resets. */
243235
card->br_short = short_reset;
244236

@@ -259,8 +251,6 @@ static void br_work(struct work_struct *work)
259251
time_before64(get_jiffies_64(), card->reset_jiffies + 2 * HZ)) {
260252
trace_bus_reset_postpone(card->generation, card->br_short);
261253

262-
if (unlikely(fw_core_param_debug & FW_CORE_PARAM_DEBUG_BUSRESETS))
263-
fw_notice(card, "delaying bus reset\n");
264254
if (!queue_delayed_work(fw_workqueue, &card->br_work, 2 * HZ))
265255
fw_card_put(card);
266256
return;

drivers/firewire/core-transaction.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1390,12 +1390,5 @@ static void __exit fw_core_cleanup(void)
13901390
idr_destroy(&fw_device_idr);
13911391
}
13921392

1393-
int fw_core_param_debug;
1394-
module_param_named(debug, fw_core_param_debug, int, 0644);
1395-
MODULE_PARM_DESC(debug, "Verbose logging (default = 0"
1396-
", bus resets = " __stringify(FW_CORE_PARAM_DEBUG_BUSRESETS)
1397-
")");
1398-
1399-
14001393
module_init(fw_core_init);
14011394
module_exit(fw_core_cleanup);

drivers/firewire/core.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,6 @@ static inline bool tcode_is_link_internal(unsigned int tcode)
245245
/* OHCI-1394's default upper bound for physical DMA: 4 GB */
246246
#define FW_MAX_PHYSICAL_RANGE (1ULL << 32)
247247

248-
#define FW_CORE_PARAM_DEBUG_BUSRESETS 1
249-
250-
extern int fw_core_param_debug;
251-
252248
void fw_core_handle_request(struct fw_card *card, struct fw_packet *request);
253249
void fw_core_handle_response(struct fw_card *card, struct fw_packet *packet);
254250
int fw_get_response_length(struct fw_request *request);

0 commit comments

Comments
 (0)