Commit bb93109e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull firewire updates from Stefan Richter:
 "Make struct ieee1394_device_id.driver_data actually avaliable to 1394
  protocol drivers.  This is especially useful to 1394 audio drivers for
  model-specific parameters and methods"

* tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: remove support of fw_driver.driver.probe and .remove methods
  firewire: introduce fw_driver.probe and .remove methods
parents 23e3a1d9 bcabcfd2

drivers/firewire/core-device.c

+30 −9
Original line number Diff line number Diff line
@@ -165,25 +165,44 @@ static bool match_ids(const struct ieee1394_device_id *id_table, int *id) 
	return (match & id_table->match_flags) == id_table->match_flags;

}



static bool is_fw_unit(struct device *dev);



static int fw_unit_match(struct device *dev, struct device_driver *drv)

static const struct ieee1394_device_id *unit_match(struct device *dev,

						   struct device_driver *drv)

{

	const struct ieee1394_device_id *id_table =

			container_of(drv, struct fw_driver, driver)->id_table;

	int id[] = {0, 0, 0, 0};



	/* We only allow binding to fw_units. */

	if (!is_fw_unit(dev))

		return 0;



	get_modalias_ids(fw_unit(dev), id);



	for (; id_table->match_flags != 0; id_table++)

		if (match_ids(id_table, id))

			return 1;

			return id_table;



	return 0;

	return NULL;

}



static bool is_fw_unit(struct device *dev);



static int fw_unit_match(struct device *dev, struct device_driver *drv)

{

	/* We only allow binding to fw_units. */

	return is_fw_unit(dev) && unit_match(dev, drv) != NULL;

}



static int fw_unit_probe(struct device *dev)

{

	struct fw_driver *driver =

			container_of(dev->driver, struct fw_driver, driver);



	return driver->probe(fw_unit(dev), unit_match(dev, dev->driver));

}



static int fw_unit_remove(struct device *dev)

{

	struct fw_driver *driver =

			container_of(dev->driver, struct fw_driver, driver);



	return driver->remove(fw_unit(dev)), 0;

}



static int get_modalias(struct fw_unit *unit, char *buffer, size_t buffer_size)
@@ -213,6 +232,8 @@ static int fw_unit_uevent(struct device *dev, struct kobj_uevent_env *env) 
struct bus_type fw_bus_type = {

	.name = "firewire",

	.match = fw_unit_match,

	.probe = fw_unit_probe,

	.remove = fw_unit_remove,

};

EXPORT_SYMBOL(fw_bus_type);

drivers/firewire/net.c

+24 −26
Original line number Diff line number Diff line
@@ -1440,9 +1440,9 @@ static int fwnet_add_peer(struct fwnet_device *dev, 
	return 0;

}



static int fwnet_probe(struct device *_dev)

static int fwnet_probe(struct fw_unit *unit,

		       const struct ieee1394_device_id *id)

{

	struct fw_unit *unit = fw_unit(_dev);

	struct fw_device *device = fw_parent_device(unit);

	struct fw_card *card = device->card;

	struct net_device *net;
@@ -1526,6 +1526,24 @@ static int fwnet_probe(struct device *_dev) 
	return ret;

}



/*

 * FIXME abort partially sent fragmented datagrams,

 * discard partially received fragmented datagrams

 */

static void fwnet_update(struct fw_unit *unit)

{

	struct fw_device *device = fw_parent_device(unit);

	struct fwnet_peer *peer = dev_get_drvdata(&unit->device);

	int generation;



	generation = device->generation;



	spin_lock_irq(&peer->dev->lock);

	peer->node_id    = device->node_id;

	peer->generation = generation;

	spin_unlock_irq(&peer->dev->lock);

}



static void fwnet_remove_peer(struct fwnet_peer *peer, struct fwnet_device *dev)

{

	struct fwnet_partial_datagram *pd, *pd_next;
@@ -1542,9 +1560,9 @@ static void fwnet_remove_peer(struct fwnet_peer *peer, struct fwnet_device *dev) 
	kfree(peer);

}



static int fwnet_remove(struct device *_dev)

static void fwnet_remove(struct fw_unit *unit)

{

	struct fwnet_peer *peer = dev_get_drvdata(_dev);

	struct fwnet_peer *peer = dev_get_drvdata(&unit->device);

	struct fwnet_device *dev = peer->dev;

	struct net_device *net;

	int i;
@@ -1569,26 +1587,6 @@ static int fwnet_remove(struct device *_dev) 
	}



	mutex_unlock(&fwnet_device_mutex);



	return 0;

}



/*

 * FIXME abort partially sent fragmented datagrams,

 * discard partially received fragmented datagrams

 */

static void fwnet_update(struct fw_unit *unit)

{

	struct fw_device *device = fw_parent_device(unit);

	struct fwnet_peer *peer = dev_get_drvdata(&unit->device);

	int generation;



	generation = device->generation;



	spin_lock_irq(&peer->dev->lock);

	peer->node_id    = device->node_id;

	peer->generation = generation;

	spin_unlock_irq(&peer->dev->lock);

}



static const struct ieee1394_device_id fwnet_id_table[] = {
@@ -1614,10 +1612,10 @@ static struct fw_driver fwnet_driver = { 
		.owner  = THIS_MODULE,

		.name   = KBUILD_MODNAME,

		.bus    = &fw_bus_type,

		.probe  = fwnet_probe,

		.remove = fwnet_remove,

	},

	.probe    = fwnet_probe,

	.update   = fwnet_update,

	.remove   = fwnet_remove,

	.id_table = fwnet_id_table,

};

drivers/firewire/sbp2.c

+7 −10
Original line number Diff line number Diff line
@@ -1128,11 +1128,10 @@ static void sbp2_init_workarounds(struct sbp2_target *tgt, u32 model, 
}



static struct scsi_host_template scsi_driver_template;

static int sbp2_remove(struct device *dev);

static void sbp2_remove(struct fw_unit *unit);



static int sbp2_probe(struct device *dev)

static int sbp2_probe(struct fw_unit *unit, const struct ieee1394_device_id *id)

{

	struct fw_unit *unit = fw_unit(dev);

	struct fw_device *device = fw_parent_device(unit);

	struct sbp2_target *tgt;

	struct sbp2_logical_unit *lu;
@@ -1196,7 +1195,7 @@ static int sbp2_probe(struct device *dev) 
	return 0;



 fail_remove:

	sbp2_remove(dev);

	sbp2_remove(unit);

	return -ENOMEM;



 fail_shost_put:
@@ -1222,9 +1221,8 @@ static void sbp2_update(struct fw_unit *unit) 
	}

}



static int sbp2_remove(struct device *dev)

static void sbp2_remove(struct fw_unit *unit)

{

	struct fw_unit *unit = fw_unit(dev);

	struct fw_device *device = fw_parent_device(unit);

	struct sbp2_target *tgt = dev_get_drvdata(&unit->device);

	struct sbp2_logical_unit *lu, *next;
@@ -1261,10 +1259,9 @@ static int sbp2_remove(struct device *dev) 
		kfree(lu);

	}

	scsi_remove_host(shost);

	dev_notice(dev, "released target %d:0:0\n", shost->host_no);

	dev_notice(&unit->device, "released target %d:0:0\n", shost->host_no);



	scsi_host_put(shost);

	return 0;

}



#define SBP2_UNIT_SPEC_ID_ENTRY	0x0000609e
@@ -1285,10 +1282,10 @@ static struct fw_driver sbp2_driver = { 
		.owner  = THIS_MODULE,

		.name   = KBUILD_MODNAME,

		.bus    = &fw_bus_type,

		.probe  = sbp2_probe,

		.remove = sbp2_remove,

	},

	.probe    = sbp2_probe,

	.update   = sbp2_update,

	.remove   = sbp2_remove,

	.id_table = sbp2_id_table,

};

drivers/media/firewire/firedtv-fw.c

+9 −10
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static const char * const model_names[] = { 
/* Adjust the template string if models with longer names appear. */

#define MAX_MODEL_NAME_LEN sizeof("FireDTV ????")



static int node_probe(struct device *dev)

static int node_probe(struct fw_unit *unit, const struct ieee1394_device_id *id)

{

	struct firedtv *fdtv;

	char name[MAX_MODEL_NAME_LEN];
@@ -258,8 +258,8 @@ static int node_probe(struct device *dev) 
	if (!fdtv)

		return -ENOMEM;



	dev_set_drvdata(dev, fdtv);

	fdtv->device		= dev;

	dev_set_drvdata(&unit->device, fdtv);

	fdtv->device		= &unit->device;

	fdtv->isochannel	= -1;

	fdtv->voltage		= 0xff;

	fdtv->tone		= 0xff;
@@ -269,7 +269,7 @@ static int node_probe(struct device *dev) 
	mutex_init(&fdtv->demux_mutex);

	INIT_WORK(&fdtv->remote_ctrl_work, avc_remote_ctrl_work);



	name_len = fw_csr_string(fw_unit(dev)->directory, CSR_MODEL,

	name_len = fw_csr_string(unit->directory, CSR_MODEL,

				 name, sizeof(name));

	for (i = ARRAY_SIZE(model_names); --i; )

		if (strlen(model_names[i]) <= name_len &&
@@ -277,7 +277,7 @@ static int node_probe(struct device *dev) 
			break;

	fdtv->type = i;



	err = fdtv_register_rc(fdtv, dev);

	err = fdtv_register_rc(fdtv, &unit->device);

	if (err)

		goto fail_free;
@@ -307,9 +307,9 @@ fail_free: 
	return err;

}



static int node_remove(struct device *dev)

static void node_remove(struct fw_unit *unit)

{

	struct firedtv *fdtv = dev_get_drvdata(dev);

	struct firedtv *fdtv = dev_get_drvdata(&unit->device);



	fdtv_dvb_unregister(fdtv);
@@ -320,7 +320,6 @@ static int node_remove(struct device *dev) 
	fdtv_unregister_rc(fdtv);



	kfree(fdtv);

	return 0;

}



static void node_update(struct fw_unit *unit)
@@ -391,10 +390,10 @@ static struct fw_driver fdtv_driver = { 
		.owner  = THIS_MODULE,

		.name   = "firedtv",

		.bus    = &fw_bus_type,

		.probe  = node_probe,

		.remove = node_remove,

	},

	.probe    = node_probe,

	.update   = node_update,

	.remove   = node_remove,

	.id_table = fdtv_id_table,

};

drivers/staging/fwserial/fwserial.c

+6 −8
Original line number Diff line number Diff line
@@ -2446,9 +2446,9 @@ free_ports: 
 * last peer for a given fw_card triggering the destruction of the same

 * fw_serial for the same fw_card.

 */

static int fwserial_probe(struct device *dev)

static int fwserial_probe(struct fw_unit *unit,

			  const struct ieee1394_device_id *id)

{

	struct fw_unit *unit = fw_unit(dev);

	struct fw_serial *serial;

	int err;
@@ -2470,9 +2470,9 @@ static int fwserial_probe(struct device *dev) 
 * specific fw_card). If this is the last peer being removed, then trigger

 * the destruction of the underlying TTYs.

 */

static int fwserial_remove(struct device *dev)

static void fwserial_remove(struct fw_unit *unit)

{

	struct fwtty_peer *peer = dev_get_drvdata(dev);

	struct fwtty_peer *peer = dev_get_drvdata(&unit->device);

	struct fw_serial *serial = peer->serial;

	int i;
@@ -2492,8 +2492,6 @@ static int fwserial_remove(struct device *dev) 
		kref_put(&serial->kref, fwserial_destroy);

	}

	mutex_unlock(&fwserial_list_mutex);



	return 0;

}



/**
@@ -2538,10 +2536,10 @@ static struct fw_driver fwserial_driver = { 
		.owner  = THIS_MODULE,

		.name   = KBUILD_MODNAME,

		.bus    = &fw_bus_type,

		.probe  = fwserial_probe,

		.remove = fwserial_remove,

	},

	.probe    = fwserial_probe,

	.update   = fwserial_update,

	.remove   = fwserial_remove,

	.id_table = fwserial_id_table,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE