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

Commit 6737231e authored by Ben Collins's avatar Ben Collins
Browse files

ieee1394: add preprocessor constant for invalid csr address 



Replace occurrences of the magic value ~(u64)0 for invalid
CSR address spaces by a named constant for better readability.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarBen Collins <bcollins@ubuntu.com>
parent e269d276

drivers/ieee1394/csr1212.c

+1 −1
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ static int csr1212_append_new_cache(struct csr1212_csr *csr, size_t romsize) 
	romsize = (romsize + (csr->max_rom - 1)) & ~(csr->max_rom - 1);



	csr_addr = csr->ops->allocate_addr_range(romsize, csr->max_rom, csr->private);

	if (csr_addr == ~0ULL) {

	if (csr_addr == CSR1212_INVALID_ADDR_SPACE) {

		return CSR1212_ENOMEM;

	}

	if (csr_addr < CSR1212_REGISTER_SPACE_BASE) {

drivers/ieee1394/csr1212.h

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


#define  CSR1212_EXTENDED_ROM_SIZE		(0x10000 * sizeof(u_int32_t))



#define  CSR1212_INVALID_ADDR_SPACE		-1



/* Config ROM image structures */

struct csr1212_bus_info_block_img {

drivers/ieee1394/eth1394.c

+7 −9
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static int eth1394_probe(struct device *dev) 
	spin_lock_init(&node_info->pdg.lock);

	INIT_LIST_HEAD(&node_info->pdg.list);

	node_info->pdg.sz = 0;

	node_info->fifo = ETHER1394_INVALID_ADDR;

	node_info->fifo = CSR1212_INVALID_ADDR_SPACE;



	ud->device.driver_data = node_info;

	new_node->ud = ud;
@@ -566,13 +566,11 @@ static void ether1394_add_host (struct hpsb_host *host) 
	if (!(host->config_roms & HPSB_CONFIG_ROM_ENTRY_IP1394))

		return;



	fifo_addr = hpsb_allocate_and_register_addrspace(&eth1394_highlevel,

							 host,

							 &addr_ops,

							 ETHER1394_REGION_ADDR_LEN,

							 ETHER1394_REGION_ADDR_LEN,

							 -1, -1);

	if (fifo_addr == ~0ULL)

	fifo_addr = hpsb_allocate_and_register_addrspace(

			&eth1394_highlevel, host, &addr_ops,

			ETHER1394_REGION_ADDR_LEN, ETHER1394_REGION_ADDR_LEN,

			CSR1212_INVALID_ADDR_SPACE, CSR1212_INVALID_ADDR_SPACE);

	if (fifo_addr == CSR1212_INVALID_ADDR_SPACE)

		goto out;



	/* We should really have our own alloc_hpsbdev() function in
@@ -1686,7 +1684,7 @@ static int ether1394_tx (struct sk_buff *skb, struct net_device *dev) 
			goto fail;

		}

		node_info = (struct eth1394_node_info*)node->ud->device.driver_data;

		if (node_info->fifo == ETHER1394_INVALID_ADDR) {

		if (node_info->fifo == CSR1212_INVALID_ADDR_SPACE) {

			ret = -EAGAIN;

			goto fail;

		}

drivers/ieee1394/eth1394.h

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ 
 * S3200 (per Table 16-3 of IEEE 1394b-2002). */

#define ETHER1394_REGION_ADDR_LEN	4096



#define ETHER1394_INVALID_ADDR		~0ULL



/* GASP identifier numbers for IPv4 over IEEE 1394 */

#define ETHER1394_GASP_SPECIFIER_ID	0x00005E

#define ETHER1394_GASP_SPECIFIER_ID_HI	((ETHER1394_GASP_SPECIFIER_ID >> 8) & 0xffff)

drivers/ieee1394/highlevel.c

+5 −4
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl, 
{

	struct hpsb_address_serve *as, *a1, *a2;

	struct list_head *entry;

	u64 retval = ~0ULL;

	u64 retval = CSR1212_INVALID_ADDR_SPACE;

	unsigned long flags;

	u64 align_mask = ~(alignment - 1);
@@ -314,7 +314,8 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl, 


	/* default range,

	 * avoids controller's posted write area (see OHCI 1.1 clause 1.5) */

	if (start == ~0ULL && end == ~0ULL) {

	if (start == CSR1212_INVALID_ADDR_SPACE &&

	    end   == CSR1212_INVALID_ADDR_SPACE) {

		start = host->middle_addr_space;

		end   = CSR1212_ALL_SPACE_END;

	}
@@ -360,7 +361,7 @@ u64 hpsb_allocate_and_register_addrspace(struct hpsb_highlevel *hl, 


	write_unlock_irqrestore(&addr_space_lock, flags);



	if (retval == ~0ULL) {

	if (retval == CSR1212_INVALID_ADDR_SPACE) {

		kfree(as);

	}