mirror of https://gitee.com/openkylin/linux.git
ieee1394: constify device ID tables
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
parent
421696887b
commit
c64094684d
|
@ -2175,7 +2175,7 @@ static const struct file_operations dv1394_fops=
|
||||||
* Export information about protocols/devices supported by this driver.
|
* Export information about protocols/devices supported by this driver.
|
||||||
*/
|
*/
|
||||||
#ifdef MODULE
|
#ifdef MODULE
|
||||||
static struct ieee1394_device_id dv1394_id_table[] = {
|
static const struct ieee1394_device_id dv1394_id_table[] = {
|
||||||
{
|
{
|
||||||
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
|
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
|
||||||
.specifier_id = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff,
|
.specifier_id = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff,
|
||||||
|
|
|
@ -438,7 +438,7 @@ static int eth1394_update(struct unit_directory *ud)
|
||||||
return eth1394_new_node(hi, ud);
|
return eth1394_new_node(hi, ud);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct ieee1394_device_id eth1394_id_table[] = {
|
static const struct ieee1394_device_id eth1394_id_table[] = {
|
||||||
{
|
{
|
||||||
.match_flags = (IEEE1394_MATCH_SPECIFIER_ID |
|
.match_flags = (IEEE1394_MATCH_SPECIFIER_ID |
|
||||||
IEEE1394_MATCH_VERSION),
|
IEEE1394_MATCH_VERSION),
|
||||||
|
|
|
@ -484,7 +484,7 @@ static struct device_attribute *const fw_host_attrs[] = {
|
||||||
static ssize_t fw_show_drv_device_ids(struct device_driver *drv, char *buf)
|
static ssize_t fw_show_drv_device_ids(struct device_driver *drv, char *buf)
|
||||||
{
|
{
|
||||||
struct hpsb_protocol_driver *driver;
|
struct hpsb_protocol_driver *driver;
|
||||||
struct ieee1394_device_id *id;
|
const struct ieee1394_device_id *id;
|
||||||
int length = 0;
|
int length = 0;
|
||||||
char *scratch = buf;
|
char *scratch = buf;
|
||||||
|
|
||||||
|
@ -658,7 +658,7 @@ static int nodemgr_bus_match(struct device * dev, struct device_driver * drv)
|
||||||
{
|
{
|
||||||
struct hpsb_protocol_driver *driver;
|
struct hpsb_protocol_driver *driver;
|
||||||
struct unit_directory *ud;
|
struct unit_directory *ud;
|
||||||
struct ieee1394_device_id *id;
|
const struct ieee1394_device_id *id;
|
||||||
|
|
||||||
/* We only match unit directories */
|
/* We only match unit directories */
|
||||||
if (dev->platform_data != &nodemgr_ud_platform_data)
|
if (dev->platform_data != &nodemgr_ud_platform_data)
|
||||||
|
|
|
@ -125,7 +125,7 @@ struct hpsb_protocol_driver {
|
||||||
* probe function below can implement further protocol
|
* probe function below can implement further protocol
|
||||||
* dependent or vendor dependent checking.
|
* dependent or vendor dependent checking.
|
||||||
*/
|
*/
|
||||||
struct ieee1394_device_id *id_table;
|
const struct ieee1394_device_id *id_table;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The update function is called when the node has just
|
* The update function is called when the node has just
|
||||||
|
|
|
@ -2982,7 +2982,7 @@ static int raw1394_release(struct inode *inode, struct file *file)
|
||||||
* Export information about protocols/devices supported by this driver.
|
* Export information about protocols/devices supported by this driver.
|
||||||
*/
|
*/
|
||||||
#ifdef MODULE
|
#ifdef MODULE
|
||||||
static struct ieee1394_device_id raw1394_id_table[] = {
|
static const struct ieee1394_device_id raw1394_id_table[] = {
|
||||||
{
|
{
|
||||||
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
|
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
|
||||||
.specifier_id = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff,
|
.specifier_id = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff,
|
||||||
|
|
|
@ -285,7 +285,7 @@ static const struct hpsb_address_ops sbp2_physdma_ops = {
|
||||||
/*
|
/*
|
||||||
* Interface to driver core and IEEE 1394 core
|
* Interface to driver core and IEEE 1394 core
|
||||||
*/
|
*/
|
||||||
static struct ieee1394_device_id sbp2_id_table[] = {
|
static const struct ieee1394_device_id sbp2_id_table[] = {
|
||||||
{
|
{
|
||||||
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
|
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
|
||||||
.specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
|
.specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
|
||||||
|
|
|
@ -1294,7 +1294,7 @@ static const struct file_operations video1394_fops=
|
||||||
* Export information about protocols/devices supported by this driver.
|
* Export information about protocols/devices supported by this driver.
|
||||||
*/
|
*/
|
||||||
#ifdef MODULE
|
#ifdef MODULE
|
||||||
static struct ieee1394_device_id video1394_id_table[] = {
|
static const struct ieee1394_device_id video1394_id_table[] = {
|
||||||
{
|
{
|
||||||
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
|
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
|
||||||
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
|
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
|
||||||
|
|
Loading…
Reference in New Issue