Skip to content

Commit bb9f7dd

Browse files
KAGA-KOKOaxboe
authored andcommitted
skd: Bump driver version
Bump the driver version. Remove the build ID because build IDs do not make sense for an upstream kernel driver. Keep the driver version in the module information but do not report it during every load, unload or probe. Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 74c7428 commit bb9f7dd

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

drivers/block/skd_main.c

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,13 @@ static int skd_isr_comp_limit = 4;
5353
} while (0)
5454

5555
#define DRV_NAME "skd"
56-
#define DRV_VERSION "2.2.1"
57-
#define DRV_BUILD_ID "0260"
56+
#define DRV_VERSION "3.0.0"
5857
#define PFX DRV_NAME ": "
5958

6059
MODULE_LICENSE("GPL");
6160

62-
MODULE_DESCRIPTION("STEC s1120 PCIe SSD block driver (b" DRV_BUILD_ID ")");
63-
MODULE_VERSION(DRV_VERSION "-" DRV_BUILD_ID);
61+
MODULE_DESCRIPTION("STEC s1120 PCIe SSD block driver");
62+
MODULE_VERSION(DRV_VERSION);
6463

6564
#define PCI_VENDOR_ID_STEC 0x1B39
6665
#define PCI_DEVICE_ID_S1120 0x0001
@@ -3206,10 +3205,8 @@ static int skd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
32063205
char pci_str[32];
32073206
struct skd_device *skdev;
32083207

3209-
dev_info(&pdev->dev, "STEC s1120 Driver(%s) version %s-b%s\n",
3210-
DRV_NAME, DRV_VERSION, DRV_BUILD_ID);
3211-
dev_info(&pdev->dev, "vendor=%04X device=%04x\n", pdev->vendor,
3212-
pdev->device);
3208+
dev_dbg(&pdev->dev, "vendor=%04X device=%04x\n", pdev->vendor,
3209+
pdev->device);
32133210

32143211
rc = pci_enable_device(pdev);
32153212
if (rc)
@@ -3664,8 +3661,6 @@ static int __init skd_init(void)
36643661
BUILD_BUG_ON(offsetof(struct skd_msg_buf, scsi) != 64);
36653662
BUILD_BUG_ON(sizeof(struct skd_msg_buf) != SKD_N_FITMSG_BYTES);
36663663

3667-
pr_info(PFX " v%s-b%s loaded\n", DRV_VERSION, DRV_BUILD_ID);
3668-
36693664
switch (skd_isr_type) {
36703665
case SKD_IRQ_LEGACY:
36713666
case SKD_IRQ_MSI:
@@ -3714,8 +3709,6 @@ static int __init skd_init(void)
37143709

37153710
static void __exit skd_exit(void)
37163711
{
3717-
pr_info(PFX " v%s-b%s unloading\n", DRV_VERSION, DRV_BUILD_ID);
3718-
37193712
pci_unregister_driver(&skd_driver);
37203713

37213714
if (skd_major)

0 commit comments

Comments
 (0)