fix one typo: ccw driver -> ccw_driver and one function rename. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> --- arch/s390/include/asm/ccwdev.h | 2 +- arch/s390/include/asm/cio.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/s390/include/asm/ccwdev.h b/arch/s390/include/asm/ccwdev.h index bf605e1fcf6a..0495ac635ed5 100644 --- a/arch/s390/include/asm/ccwdev.h +++ b/arch/s390/include/asm/ccwdev.h @@ -100,41 +100,41 @@ struct ccw_device { */ #define PE_NONE 0x0 #define PE_PATH_GONE 0x1 /* A path is no longer available. */ #define PE_PATH_AVAILABLE 0x2 /* A path has become available and was successfully verified. */ #define PE_PATHGROUP_ESTABLISHED 0x4 /* A pathgroup was reset and had to be established again. */ #define PE_PATH_FCES_EVENT 0x8 /* The FCES Status of a path has * changed. */ /* * Possible CIO actions triggered by the unit check handler. */ enum uc_todo { UC_TODO_RETRY, UC_TODO_RETRY_ON_NEW_PATH, UC_TODO_STOP }; /** - * struct ccw driver - device driver for channel attached devices + * struct ccw_driver - device driver for channel attached devices * @ids: ids supported by this driver * @probe: function called on probe * @remove: function called on remove * @set_online: called when setting device online * @set_offline: called when setting device offline * @notify: notify driver of device state changes * @path_event: notify driver of channel path events * @shutdown: called at device shutdown * @prepare: prepare for pm state transition * @complete: undo work done in @prepare * @freeze: callback for freezing during hibernation snapshotting * @thaw: undo work done in @freeze * @restore: callback for restoring after hibernation * @uc_handler: callback for unit check handler * @driver: embedded device driver structure * @int_class: interruption class to use for accounting interrupts */ struct ccw_driver { struct ccw_device_id *ids; int (*probe) (struct ccw_device *); diff --git a/arch/s390/include/asm/cio.h b/arch/s390/include/asm/cio.h index e36cb67d2441..ac02df906cae 100644 --- a/arch/s390/include/asm/cio.h +++ b/arch/s390/include/asm/cio.h @@ -312,41 +312,41 @@ struct node_descriptor { /* Device did not respond in time. */ #define CIO_BOXED 0x0010 /** * struct ccw_dev_id - unique identifier for ccw devices * @ssid: subchannel set id * @devno: device number * * This structure is not directly based on any hardware structure. The * hardware identifies a device by its device number and its subchannel, * which is in turn identified by its id. In order to get a unique identifier * for ccw devices across subchannel sets, @struct ccw_dev_id has been * introduced. */ struct ccw_dev_id { u8 ssid; u16 devno; }; /** - * ccw_device_id_is_equal() - compare two ccw_dev_ids + * ccw_dev_id_is_equal() - compare two ccw_dev_ids * @dev_id1: a ccw_dev_id * @dev_id2: another ccw_dev_id * Returns: * %1 if the two structures are equal field-by-field, * %0 if not. * Context: * any */ static inline int ccw_dev_id_is_equal(struct ccw_dev_id *dev_id1, struct ccw_dev_id *dev_id2) { if ((dev_id1->ssid == dev_id2->ssid) && (dev_id1->devno == dev_id2->devno)) return 1; return 0; } /** * pathmask_to_pos() - find the position of the left-most bit in a pathmask * @mask: pathmask with at least one bit set -- 2.28.0