From 519389ac7ae492dbbea281e30f70e3fac0ca7f83 Mon Sep 17 00:00:00 2001
From: Takuya ASADA <syuu@cloudius-systems.com>
Date: Wed, 5 Feb 2014 08:22:55 +0900
Subject: [PATCH] Coding style fix for virtio-scsi.cc/hh
Signed-off-by: Takuya ASADA <syuu@cloudius-systems.com>
Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>
---
drivers/virtio-scsi.cc | 6 +++---
drivers/virtio-scsi.hh | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/virtio-scsi.cc b/drivers/virtio-scsi.cc
index c60306395..d57e905c0 100644
--- a/drivers/virtio-scsi.cc
+++ b/drivers/virtio-scsi.cc
@@ -314,7 +314,7 @@ void scsi::add_lun(u16 target, u16 lun)
}
-void scsi::scan(void)
+void scsi::scan()
{
/* TODO: Support more target */
for (u16 target = 0; target < 1; target++) {
@@ -456,10 +456,10 @@ int scsi::make_request(struct bio* bio)
return 0;
}
-u32 scsi::get_driver_features(void)
+u32 scsi::get_driver_features()
{
auto base = virtio_driver::get_driver_features();
- return (base | ( 1 << VIRTIO_SCSI_F_INOUT));
+ return base | ( 1 << VIRTIO_SCSI_F_INOUT);
}
hw_driver* scsi::probe(hw_device* dev)
diff --git a/drivers/virtio-scsi.hh b/drivers/virtio-scsi.hh
index e3b5c6d73..58fb08806 100644
--- a/drivers/virtio-scsi.hh
+++ b/drivers/virtio-scsi.hh
@@ -120,10 +120,10 @@ public:
explicit scsi(pci::device& dev);
virtual ~scsi();
- virtual const std::string get_name(void) { return _driver_name; }
+ virtual const std::string get_name() { return _driver_name; }
bool read_config();
- virtual u32 get_driver_features(void);
+ virtual u32 get_driver_features();
static struct scsi_priv *get_priv(struct bio *bio) {
return reinterpret_cast<struct scsi_priv*>(bio->bio_dev->private_data);
@@ -138,7 +138,7 @@ public:
std::vector<u16> exec_report_luns(u16 target);
void add_lun(u16 target_id, u16 lun_id);
void exec_read_capacity(u16 target, u16 lun, size_t &devsize);
- void scan(void);
+ void scan();
int exec_readwrite(struct bio *bio, u8 cmd);
int exec_synccache(struct bio *bio, u8 cmd);
--
GitLab