diff options
author | Pete Zaitcev <zaitcev@redhat.com> | 2008-04-19 17:45:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-05-02 13:25:52 -0400 |
commit | 9029b174ba22918d0a0aa3b71859854bd50c39cc (patch) | |
tree | 305074dcc3890085712992ce73fb39e03adc5acc | |
parent | 0da13c8c3dfb1ab6c56f2a70fadfddd57e0d7c42 (diff) |
ub: Cosmetics
Fix a few comments and printk statements.
Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/block/ub.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/block/ub.c b/drivers/block/ub.c index e2c3ebd8db22..3a281ef11ffa 100644 --- a/drivers/block/ub.c +++ b/drivers/block/ub.c | |||
@@ -1309,8 +1309,7 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd) | |||
1309 | ub_state_done(sc, cmd, -EIO); | 1309 | ub_state_done(sc, cmd, -EIO); |
1310 | 1310 | ||
1311 | } else { | 1311 | } else { |
1312 | printk(KERN_WARNING "%s: " | 1312 | printk(KERN_WARNING "%s: wrong command state %d\n", |
1313 | "wrong command state %d\n", | ||
1314 | sc->name, cmd->state); | 1313 | sc->name, cmd->state); |
1315 | ub_state_done(sc, cmd, -EINVAL); | 1314 | ub_state_done(sc, cmd, -EINVAL); |
1316 | return; | 1315 | return; |
@@ -1533,8 +1532,7 @@ static void ub_top_sense_done(struct ub_dev *sc, struct ub_scsi_cmd *scmd) | |||
1533 | return; | 1532 | return; |
1534 | } | 1533 | } |
1535 | if (cmd->state != UB_CMDST_SENSE) { | 1534 | if (cmd->state != UB_CMDST_SENSE) { |
1536 | printk(KERN_WARNING "%s: " | 1535 | printk(KERN_WARNING "%s: sense done with bad cmd state %d\n", |
1537 | "sense done with bad cmd state %d\n", | ||
1538 | sc->name, cmd->state); | 1536 | sc->name, cmd->state); |
1539 | return; | 1537 | return; |
1540 | } | 1538 | } |
@@ -1738,7 +1736,7 @@ static int ub_bd_ioctl(struct inode *inode, struct file *filp, | |||
1738 | } | 1736 | } |
1739 | 1737 | ||
1740 | /* | 1738 | /* |
1741 | * This is called once a new disk was seen by the block layer or by ub_probe(). | 1739 | * This is called by check_disk_change if we reported a media change. |
1742 | * The main onjective here is to discover the features of the media such as | 1740 | * The main onjective here is to discover the features of the media such as |
1743 | * the capacity, read-only status, etc. USB storage generally does not | 1741 | * the capacity, read-only status, etc. USB storage generally does not |
1744 | * need to be spun up, but if we needed it, this would be the place. | 1742 | * need to be spun up, but if we needed it, this would be the place. |
@@ -2154,8 +2152,7 @@ static int ub_get_pipes(struct ub_dev *sc, struct usb_device *dev, | |||
2154 | } | 2152 | } |
2155 | 2153 | ||
2156 | if (ep_in == NULL || ep_out == NULL) { | 2154 | if (ep_in == NULL || ep_out == NULL) { |
2157 | printk(KERN_NOTICE "%s: failed endpoint check\n", | 2155 | printk(KERN_NOTICE "%s: failed endpoint check\n", sc->name); |
2158 | sc->name); | ||
2159 | return -ENODEV; | 2156 | return -ENODEV; |
2160 | } | 2157 | } |
2161 | 2158 | ||
@@ -2372,7 +2369,7 @@ static void ub_disconnect(struct usb_interface *intf) | |||
2372 | spin_unlock_irqrestore(&ub_lock, flags); | 2369 | spin_unlock_irqrestore(&ub_lock, flags); |
2373 | 2370 | ||
2374 | /* | 2371 | /* |
2375 | * Fence stall clearnings, operations triggered by unlinkings and so on. | 2372 | * Fence stall clearings, operations triggered by unlinkings and so on. |
2376 | * We do not attempt to unlink any URBs, because we do not trust the | 2373 | * We do not attempt to unlink any URBs, because we do not trust the |
2377 | * unlink paths in HC drivers. Also, we get -84 upon disconnect anyway. | 2374 | * unlink paths in HC drivers. Also, we get -84 upon disconnect anyway. |
2378 | */ | 2375 | */ |
@@ -2435,7 +2432,7 @@ static void ub_disconnect(struct usb_interface *intf) | |||
2435 | spin_unlock_irqrestore(sc->lock, flags); | 2432 | spin_unlock_irqrestore(sc->lock, flags); |
2436 | 2433 | ||
2437 | /* | 2434 | /* |
2438 | * There is virtually no chance that other CPU runs times so long | 2435 | * There is virtually no chance that other CPU runs a timeout so long |
2439 | * after ub_urb_complete should have called del_timer, but only if HCD | 2436 | * after ub_urb_complete should have called del_timer, but only if HCD |
2440 | * didn't forget to deliver a callback on unlink. | 2437 | * didn't forget to deliver a callback on unlink. |
2441 | */ | 2438 | */ |