Commit 5d38cb9b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'firewire-updates-6.13' of... 

Merge tag 'firewire-updates-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

Pull firewire updates from Takashi Sakamoto:
 "A few updates for the 6.13 kernel, including some typo corrections in
  the software stack and some fixes for tools. Additionally, it includes
  a change resulting from the deprecation of a kernel API in the PCI
  subsystem"

* tag 'firewire-updates-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  tools/firewire: Fix several incorrect format specifiers
  firewire: ohci: Replace deprecated PCI functions
  firewire: Correct some typos
parents e06635e2 4752e8cd

drivers/firewire/core-topology.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static struct fw_node *fw_node_create(u32 sid, int port_count, int color) 
 * two cases: either the path goes through this node, in which case

 * the hop count is the sum of the two biggest child depths plus 2.

 * Or it could be the case that the max hop path is entirely

 * containted in a child tree, in which case the max hop count is just

 * contained in a child tree, in which case the max hop count is just

 * the max hop count of this child.

 */

static void update_hop_count(struct fw_node *node)

drivers/firewire/core.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ struct fw_card_driver { 
	/*

	 * Allow the specified node ID to do direct DMA out and in of

	 * host memory.  The card will disable this for all node when

	 * a bus reset happens, so driver need to reenable this after

	 * a bus reset happens, so driver need to re-enable this after

	 * bus reset.  Returns 0 on success, -ENODEV if the card

	 * doesn't support this, -ESTALE if the generation doesn't

	 * match.

drivers/firewire/ohci.c

+5 −6
Original line number Diff line number Diff line
@@ -1384,7 +1384,7 @@ struct driver_data { 
};



/*

 * This function apppends a packet to the DMA queue for transmission.

 * This function appends a packet to the DMA queue for transmission.

 * Must always be called with the ochi->lock held to ensure proper

 * generation handling and locking around packet queue manipulation.

 */
@@ -2213,7 +2213,7 @@ static irqreturn_t irq_handler(int irq, void *data) 


	if (unlikely(param_debug > 0)) {

		dev_notice_ratelimited(ohci->card.device,

				       "The debug parameter is superceded by tracepoints events, and deprecated.");

				       "The debug parameter is superseded by tracepoints events, and deprecated.");

	}



	/*
@@ -2614,7 +2614,7 @@ static int ohci_set_config_rom(struct fw_card *card, 
	 * ConfigRomHeader and BusOptions doesn't honor the

	 * noByteSwapData bit, so with a be32 config rom, the

	 * controller will load be32 values in to these registers

	 * during the atomic update, even on litte endian

	 * during the atomic update, even on little endian

	 * architectures.  The workaround we use is to put a 0 in the

	 * header quadlet; 0 is endian agnostic and means that the

	 * config rom isn't ready yet.  In the bus reset tasklet we
@@ -3726,12 +3726,11 @@ static int pci_probe(struct pci_dev *dev, 
		return -ENXIO;

	}



	err = pcim_iomap_regions(dev, 1 << 0, ohci_driver_name);

	if (err) {

	ohci->registers = pcim_iomap_region(dev, 0, ohci_driver_name);

	if (IS_ERR(ohci->registers)) {

		ohci_err(ohci, "request and map MMIO resource unavailable\n");

		return -ENXIO;

	}

	ohci->registers = pcim_iomap_table(dev)[0];



	for (i = 0; i < ARRAY_SIZE(ohci_quirks); i++)

		if ((ohci_quirks[i].vendor == dev->vendor) &&

tools/firewire/decode-fcp.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ decode_avc(struct link_transaction *t) 
		name = info->name;

	}



	printf("av/c %s, subunit_type=%s, subunit_id=%d, opcode=%s",

	printf("av/c %s, subunit_type=%s, subunit_id=%u, opcode=%s",

	    ctype_names[frame->ctype], subunit_type_names[frame->subunit_type],

	    frame->subunit_id, name);

tools/firewire/nosy-dump.c

+3 −3
Original line number Diff line number Diff line
@@ -771,7 +771,7 @@ print_packet(uint32_t *data, size_t length) 
				if (pp->phy_config.set_root)

					printf(" set_root_id=%02x", pp->phy_config.root_id);

				if (pp->phy_config.set_gap_count)

					printf(" set_gap_count=%d", pp->phy_config.gap_count);

					printf(" set_gap_count=%u", pp->phy_config.gap_count);

			}

			break;
@@ -781,13 +781,13 @@ print_packet(uint32_t *data, size_t length) 


		case PHY_PACKET_SELF_ID:

			if (pp->self_id.extended) {

				printf("extended self id: phy_id=%02x, seq=%d",

				printf("extended self id: phy_id=%02x, seq=%u",

				       pp->ext_self_id.phy_id, pp->ext_self_id.sequence);

			} else {

				static const char * const speed_names[] = {

					"S100", "S200", "S400", "BETA"

				};

				printf("self id: phy_id=%02x, link %s, gap_count=%d, speed=%s%s%s",

				printf("self id: phy_id=%02x, link %s, gap_count=%u speed=%s%s%s",

				       pp->self_id.phy_id,

				       (pp->self_id.link_active ? "active" : "not active"),

				       pp->self_id.gap_count,